Permalink
Browse files

adding placeholders and external links to people

  • Loading branch information...
1 parent d6aa005 commit 5a0bed6fe92686a543b770e0e3004abdf19eff44 Daniele Procida committed Mar 9, 2011
Showing with 206 additions and 8 deletions.
  1. BIN arkestra_utilities/._cms_plugins.py
  2. BIN arkestra_utilities/._models.py
  3. BIN arkestra_utilities/__init__.pyc
  4. BIN arkestra_utilities/admin_tabs_extension/__init__.pyc
  5. BIN arkestra_utilities/admin_tabs_extension/models.pyc
  6. BIN arkestra_utilities/admin_tabs_extension/tabs.pyc
  7. +16 −0 arkestra_utilities/cms_plugins.py
  8. BIN arkestra_utilities/cms_plugins.pyc
  9. BIN arkestra_utilities/context_processors.pyc
  10. BIN arkestra_utilities/housekeeping/__init__.pyc
  11. BIN arkestra_utilities/housekeeping/repair_mptt.pyc
  12. BIN arkestra_utilities/housekeeping/statistics.pyc
  13. BIN arkestra_utilities/housekeeping/templatetags/__init__.pyc
  14. +60 −0 arkestra_utilities/migrations/0001_initial.py
  15. BIN arkestra_utilities/migrations/0001_initial.pyc
  16. 0 arkestra_utilities/migrations/__init__.py
  17. BIN arkestra_utilities/migrations/__init__.pyc
  18. +8 −0 arkestra_utilities/models.py
  19. BIN arkestra_utilities/models.pyc
  20. BIN arkestra_utilities/output_libraries/__init__.pyc
  21. BIN arkestra_utilities/output_libraries/plugin_widths.pyc
  22. BIN arkestra_utilities/templates/.DS_Store
  23. BIN arkestra_utilities/templates/._twitter_search.html
  24. BIN arkestra_utilities/templates/arkestra_utilities/._twitter_search.html
  25. +48 −0 arkestra_utilities/templates/arkestra_utilities/twitter_search.html
  26. +48 −0 arkestra_utilities/templates/twitter_search.html
  27. BIN arkestra_utilities/templatetags/__init__.pyc
  28. BIN arkestra_utilities/templatetags/arkestra_filters.pyc
  29. BIN arkestra_utilities/urls.pyc
  30. BIN arkestra_utilities/widgets/__init__.pyc
  31. BIN arkestra_utilities/widgets/combobox/__init__.pyc
  32. BIN arkestra_utilities/widgets/wym_editor.pyc
  33. BIN contacts_and_people/._views.py
  34. BIN contacts_and_people/__init__.pyc
  35. +4 −3 contacts_and_people/admin.py
  36. BIN contacts_and_people/admin.pyc
  37. BIN contacts_and_people/cms_app.pyc
  38. BIN contacts_and_people/cms_plugins.pyc
  39. BIN contacts_and_people/link_schemas.pyc
  40. BIN contacts_and_people/menu.pyc
  41. BIN contacts_and_people/migrations/0001_researcherteacher.pyc
  42. BIN contacts_and_people/migrations/0002_uniqueslugs.pyc
  43. BIN contacts_and_people/migrations/0003_orders.pyc
  44. BIN contacts_and_people/migrations/0004_URLFields.pyc
  45. BIN contacts_and_people/migrations/0005_URLFields.pyc
  46. BIN contacts_and_people/migrations/0006_URLFields.pyc
  47. BIN contacts_and_people/migrations/0007_active.pyc
  48. BIN contacts_and_people/migrations/0008_test.pyc
  49. BIN contacts_and_people/migrations/0009_test.pyc
  50. BIN contacts_and_people/migrations/0010_test.pyc
  51. BIN contacts_and_people/migrations/0011_home_and_key_member.pyc
  52. BIN contacts_and_people/migrations/0012_ordering.pyc
  53. BIN contacts_and_people/migrations/0013_building.pyc
  54. BIN contacts_and_people/migrations/0014_buildingslug.pyc
  55. BIN contacts_and_people/migrations/0015_test.pyc
  56. BIN contacts_and_people/migrations/0016_plugin.pyc
  57. BIN contacts_and_people/migrations/0017_contact_field.pyc
  58. BIN contacts_and_people/migrations/0018_directory_plugin.pyc
  59. BIN contacts_and_people/migrations/0019_directory_plugin.pyc
  60. BIN contacts_and_people/migrations/0020_directory_plugin.pyc
  61. BIN contacts_and_people/migrations/0021_directory_plugin.pyc
  62. BIN contacts_and_people/migrations/0022_directory_plugin.pyc
  63. BIN contacts_and_people/migrations/0023_directory_plugin.pyc
  64. BIN contacts_and_people/migrations/0024_directory_plugin.pyc
  65. BIN contacts_and_people/migrations/0025_directory_plugin.pyc
  66. BIN contacts_and_people/migrations/0026_entity.pyc
  67. BIN contacts_and_people/migrations/0027_empty.pyc
  68. BIN contacts_and_people/migrations/0028_empty.pyc
  69. BIN contacts_and_people/migrations/0029_directory.pyc
  70. BIN contacts_and_people/migrations/0030_auto_links.pyc
  71. BIN ...people/migrations/0031_auto__del_field_site_image__del_field_entity_auto_publications_page__d.pyc
  72. BIN ...people/migrations/0032_auto__add_field_building_map__add_field_building_latitude__add_field_b.pyc
  73. BIN contacts_and_people/migrations/0033_auto__add_field_person_about.pyc
  74. BIN contacts_and_people/migrations/0034_auto__add_entitymembersplugineditor.pyc
  75. BIN contacts_and_people/migrations/0035_auto__add_field_building_about.pyc
  76. BIN ...people/migrations/0036_auto__add_field_entity_external_url__add_unique_title_abbreviation__de.pyc
  77. BIN ...people/migrations/0037_auto__del_field_entity_auto_vacancies_page__del_field_entity_vacancies.pyc
  78. BIN contacts_and_people/migrations/__init__.pyc
  79. BIN contacts_and_people/models.pyc
  80. BIN contacts_and_people/navigation.pyc
  81. BIN contacts_and_people/templates/contacts_and_people/._persondetails.html
  82. +17 −3 contacts_and_people/templates/contacts_and_people/persondetails.html
  83. BIN contacts_and_people/templatetags/__init__.pyc
  84. BIN contacts_and_people/templatetags/entity_admin_tags.pyc
  85. BIN contacts_and_people/templatetags/entity_tags.pyc
  86. BIN contacts_and_people/templatetags/person_tags.pyc
  87. BIN contacts_and_people/urls.pyc
  88. +3 −1 contacts_and_people/views.py
  89. BIN contacts_and_people/views.pyc
  90. BIN links/._fields.py
  91. BIN links/._models.py
  92. BIN links/__init__.pyc
  93. BIN links/admin.pyc
  94. BIN links/cms_plugins.pyc
  95. BIN links/link_functions.pyc
  96. BIN links/link_schemas.pyc
  97. 0 links/migrations/._0008_carousel.py
  98. BIN links/migrations/0001_key_link.pyc
  99. BIN links/migrations/0002_key_link.pyc
  100. BIN links/migrations/0003_key_link.pyc
  101. BIN links/migrations/0004_added_heading_and_metadata_field.pyc
  102. BIN links/migrations/0005_inline_links.pyc
  103. BIN links/migrations/0006_carousel.pyc
  104. BIN links/migrations/0007_focuson.pyc
  105. BIN links/migrations/0008_carousel.pyc
  106. BIN links/migrations/0009_auto__add_field_externalsite_domain__add_field_externalsite_parent__ad.pyc
  107. BIN links/migrations/0010_auto__add_linktype__add_field_externallink_kind.pyc
  108. BIN links/migrations/0011_auto__chg_field_externallink_title__chg_field_externallink_url__add_un.pyc
  109. BIN links/migrations/0012_auto__chg_field_externalsite_site__chg_field_externallink_url.pyc
  110. BIN links/migrations/0013_auto__add_field_genericlinklistplugin_final_separator__chg_field_gener.pyc
  111. BIN links/migrations/__init__.pyc
  112. +1 −1 links/models.py
  113. BIN links/models.pyc
  114. BIN links/schema_registry.pyc
  115. BIN links/templatetags/__init__.pyc
  116. BIN links/templatetags/externallink_admin_tags.pyc
  117. BIN links/templatetags/externalsite_admin_tags.pyc
  118. BIN links/templatetags/link_tags.pyc
  119. BIN news_and_events/__init__.pyc
  120. BIN news_and_events/admin.pyc
  121. BIN news_and_events/cms_plugins.pyc
  122. BIN news_and_events/functions.pyc
  123. BIN news_and_events/link_schemas.pyc
  124. BIN news_and_events/migrations/0001_firsttry.pyc
  125. BIN news_and_events/migrations/0002_unique_slug.pyc
  126. BIN news_and_events/migrations/0003_testing.pyc
  127. BIN news_and_events/migrations/0004_test.pyc
  128. BIN news_and_events/migrations/0005_test.pyc
  129. BIN news_and_events/migrations/0006_test.pyc
  130. BIN news_and_events/migrations/0007_test.pyc
  131. BIN news_and_events/migrations/0008_inheritname.pyc
  132. BIN news_and_events/migrations/0009_URLFields.pyc
  133. BIN news_and_events/migrations/0010_URLFields.pyc
  134. BIN news_and_events/migrations/0011_URLFields.pyc
  135. BIN news_and_events/migrations/0012_urlnull.pyc
  136. BIN news_and_events/migrations/0013_fieldlengths.pyc
  137. BIN news_and_events/migrations/0014_startseries.pyc
  138. BIN news_and_events/migrations/0015_sticky_bits.pyc
  139. BIN news_and_events/migrations/0016_tidyingup.pyc
  140. BIN news_and_events/migrations/0017_plugin.pyc
  141. BIN news_and_events/migrations/0018_showprevious.pyc
  142. BIN news_and_events/migrations/0019_previous_events.pyc
  143. BIN news_and_events/migrations/0020_previous_events.pyc
  144. BIN news_and_events/migrations/0021_news.pyc
  145. BIN news_and_events/migrations/0022_news.pyc
  146. BIN news_and_events/migrations/0023_models.pyc
  147. BIN news_and_events/migrations/0024_models.pyc
  148. BIN news_and_events/migrations/0025_models.pyc
  149. BIN news_and_events/migrations/0026_events.pyc
  150. BIN news_and_events/migrations/0027_image.pyc
  151. BIN news_and_events/migrations/0028_layout.pyc
  152. BIN news_and_events/migrations/0029_ordering.pyc
  153. BIN news_and_events/migrations/0030_auto__chg_field_event_slug__chg_field_newsarticle_slug.pyc
  154. BIN news_and_events/migrations/0031_nasty_manual_rename.pyc
  155. BIN news_and_events/migrations/__init__.pyc
  156. BIN news_and_events/models.pyc
  157. +1 −0 news_and_events/publisher
  158. BIN news_and_events/templatetags/__init__.pyc
  159. BIN news_and_events/templatetags/event_admin_tags.pyc
  160. BIN news_and_events/templatetags/events_tags.pyc
  161. BIN news_and_events/templatetags/news_tags.pyc
  162. BIN news_and_events/urls.pyc
  163. BIN news_and_events/views.pyc
  164. BIN vacancies_and_studentships/__init__.pyc
  165. BIN vacancies_and_studentships/admin.pyc
  166. BIN vacancies_and_studentships/cms_plugins.pyc
  167. BIN vacancies_and_studentships/link_schemas.pyc
  168. BIN vacancies_and_studentships/migrations/0001_initial.pyc
  169. BIN vacancies_and_studentships/migrations/0002_cleaning_up.pyc
  170. BIN vacancies_and_studentships/migrations/0003_minorchanges.pyc
  171. BIN vacancies_and_studentships/migrations/0003_salary-to-char.pyc
  172. BIN vacancies_and_studentships/migrations/__init__.pyc
  173. BIN vacancies_and_studentships/models.pyc
  174. BIN vacancies_and_studentships/templatetags/__init__.pyc
  175. BIN vacancies_and_studentships/views.pyc
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,16 @@
+from cms.plugins.twitter.cms_plugins import TwitterSearchPlugin
+from arkestra_utilities.models import ArkestraTwitterSearch
+from cms.plugin_pool import plugin_pool
+from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
+
+class ArkestraTwitterSearchPlugin(TwitterSearchPlugin):
+ text_enabled = True
+ render_template = "arkestra_utilities/twitter_search.html"
+ model = ArkestraTwitterSearch
+ name = _("Arkestra Twitter Search")
+
+ class PluginMedia:
+ js = ('%splugins/twitter/js/jquery.tweet.js' % settings.CMS_MEDIA_URL,)
+
+plugin_pool.register_plugin(ArkestraTwitterSearchPlugin)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,60 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Adding model 'ArkestraTwitterSearch'
+ db.create_table('cmsplugin_arkestratwittersearch', (
+ ('twittersearch_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['twitter.TwitterSearch'], unique=True, primary_key=True)),
+ ('twitter_user', self.gf('django.db.models.fields.CharField')(max_length=75)),
+ ))
+ db.send_create_signal('arkestra_utilities', ['ArkestraTwitterSearch'])
+
+
+ def backwards(self, orm):
+
+ # Deleting model 'ArkestraTwitterSearch'
+ db.delete_table('cmsplugin_arkestratwittersearch')
+
+
+ models = {
+ 'arkestra_utilities.arkestratwittersearch': {
+ 'Meta': {'object_name': 'ArkestraTwitterSearch', 'db_table': "'cmsplugin_arkestratwittersearch'", '_ormbases': ['twitter.TwitterSearch']},
+ 'twitter_user': ('django.db.models.fields.CharField', [], {'max_length': '75'}),
+ 'twittersearch_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['twitter.TwitterSearch']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'cms.cmsplugin': {
+ 'Meta': {'object_name': 'CMSPlugin'},
+ 'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
+ 'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
+ 'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+ 'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
+ },
+ 'cms.placeholder': {
+ 'Meta': {'object_name': 'Placeholder'},
+ 'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'slot': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'})
+ },
+ 'twitter.twittersearch': {
+ 'Meta': {'object_name': 'TwitterSearch', 'db_table': "'cmsplugin_twittersearch'", '_ormbases': ['cms.CMSPlugin']},
+ 'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'}),
+ 'count': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '3'}),
+ 'query': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '200', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '75', 'blank': 'True'})
+ }
+ }
+
+ complete_apps = ['arkestra_utilities']
Binary file not shown.
No changes.
Binary file not shown.
@@ -23,3 +23,11 @@ def last_edit(self):
last_edit = "Never"
return last_edit
+
+
+from django.db import models
+from cms.plugins.twitter.models import TwitterSearch
+from django.utils.translation import ugettext_lazy as _
+
+class ArkestraTwitterSearch(TwitterSearch):
+ twitter_user = models.CharField(_('twitter user'), max_length=75)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,48 @@
+{% load cms_tags i18n thumbnail %}{% plugins_media %}
+<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins.tweet.js"></script><script type="text/javascript">
+//<![CDATA[
+jQuery(document).ready(function ($) {
+ $('#twitter-container-{{ object.pk }}').tweet({
+ username: 'Laugharne2011',
+ avatar_size: null,
+ count: {{ object.count }},
+ join_text: 'auto',
+ auto_join_text_default: '{% trans "we said," %}',
+ auto_join_text_ed: '{% trans "we" %}',
+ auto_join_text_ing: '{% trans "we were" %}',
+ auto_join_text_reply: '{% trans "we replied to" %}',
+ auto_join_text_url: '{% trans "we were checking out" %}',
+ loading_text: '<span class="loader">{% trans "loading tweets..." %}<\/span>'
+ {% if object.query %},query: "{{ object.query }}"{% endif %}
+ });
+
+ // add tweet animation
+ var bound = {{ object.count }};
+ var start = 0;
+ var interval = 7500;
+
+ $('#twitter-container-{{ object.pk }}').css({
+ 'position': 'relative',
+ 'left': '0',
+ 'top': '0'
+ });
+
+ $('#twitter-container-{{ object.pk }} ul').css('position', 'absolute');
+
+ setInterval(function () {
+ start++;
+ if(start >= bound-1) { start = 0; }
+
+ $('#twitter-container-{{ object.pk }} ul').animate({
+ 'left': '0',
+ 'top': -start*14+'ex'
+ });
+ }, interval);
+});
+//]]>
+</script>
+
+<div class="plugin_twitter">
+ <a href="http://twitter.com/Laugharne2011/" class="icon-link"><img class="twitter-icon" src = "/media/images/twitter_newbird_white_50px.png" alt = "Our Twitter feed" /></a>
+ <div id="twitter-container-{{ object.pk }}"></div>
+</div>
@@ -0,0 +1,48 @@
+{% load cms_tags i18n thumbnail %}{% plugins_media %}
+<script type="text/javascript" src="{{ CMS_MEDIA_URL }}js/plugins.tweet.js"></script><script type="text/javascript">
+//<![CDATA[
+jQuery(document).ready(function ($) {
+ $('#twitter-container-{{ object.pk }}').tweet({
+ username: '{{ object.twitter_user }}',
+ avatar_size: null,
+ count: {{ object.count }},
+ join_text: 'auto',
+ auto_join_text_default: '{% trans "we said," %}',
+ auto_join_text_ed: '{% trans "we" %}',
+ auto_join_text_ing: '{% trans "we were" %}',
+ auto_join_text_reply: '{% trans "we replied to" %}',
+ auto_join_text_url: '{% trans "we were checking out" %}',
+ loading_text: '<span class="loader">{% trans "loading tweets..." %}<\/span>'
+ {% if object.query %},query: "{{ object.query }}"{% endif %}
+ });
+
+ // add tweet animation
+ var bound = {{ object.count }};
+ var start = 0;
+ var interval = 7500;
+
+ $('#twitter-container-{{ object.pk }}').css({
+ 'position': 'relative',
+ 'left': '0',
+ 'top': '0'
+ });
+
+ $('#twitter-container-{{ object.pk }} ul').css('position', 'absolute');
+
+ setInterval(function () {
+ start++;
+ if(start >= bound-1) { start = 0; }
+
+ $('#twitter-container-{{ object.pk }} ul').animate({
+ 'left': '0',
+ 'top': -start*14+'ex'
+ });
+ }, interval);
+});
+//]]>
+</script>
+
+<div class="plugin_twitter">{{ object.twitter_user }}
+ {% if object.twitter_user %}<a href="https://twitter.com/{{ object.twitter_user }}" class="icon-link"><img class="twitter-icon" src = "/media/images/twitter_newbird_white_50px.png" alt = "Our Twitter feed" /></a>{% endif %}
+ <div id="twitter-container-{{ object.pk }}"></div>
+</div>
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -29,6 +29,8 @@
from contacts_and_people import models
from links.admin import ExternalLinkForm, validate_and_get_messages
+from links.models import ExternalLink
+from links.admin import ObjectLinkInline
from cms.admin.placeholderadmin import PlaceholderAdmin
# for the WYMeditor fields
@@ -200,10 +202,9 @@ def clean(self):
class PersonAdmin(PlaceholderAdmin):
search_fields = ['given_name','surname','institutional_username',]
+ inlines = [MembershipForPersonInline, PhoneContactInline, ObjectLinkInline,]
if HAS_PUBLICATIONS:
- inlines = (MembershipForPersonInline, PhoneContactInline, ResearcherInline, )
- else:
- inlines = (MembershipForPersonInline, PhoneContactInline,)
+ inlines.append(ResearcherInline)
form = PersonForm
list_display = ( 'surname', 'given_name', 'get_entity', 'slug')
#list_editable = ('user',)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -12,7 +12,6 @@
{% endfor %}
{% endblock meta %}
-
{% block title %}
<title>{{ person }}</title>
{% endblock %}
@@ -77,12 +76,27 @@
</div>
<div class="column lastcolumn">
<div class = "">
- {% thumbnail person.image 340x340 subject_location=person.image.subject_location as image %}{% if image %}<img src="{{ image.url }}" alt="" />{% endif %}
+ {% thumbnail person.image 340x340 subject_location=person.image.subject_location crop as image %}{% if image %}<img src="{{ image.url }}" alt="" />{% endif %}
{% if home_role and multiple_entity_mode %}
<h3>Roles & memberships</h3>
{% membership_tree_roots person %}
{% endif %}
-
+ {% if links %}
+ {% regroup links by wrapped_destination_obj.heading as link_types %}
+ {% for kind in link_types %}
+ <h3>{{kind.grouper}}</h3>
+ <ul class= "none">
+ {% for link in kind.list %}
+ <li>
+ <a href = "{{ link.url }}">{% if link.text %}{{ link.text }}
+ {% else %}{{ link.destination_content_object }}
+ {% endif %}
+ </a>{% if link.include_description and link.description %}<br />{{ link.description }}{% endif %}
+ </li>
+ {% endfor %}
+ </ul>
+ {% endfor %}
+ {% endif %}
</div>
</div>
</div>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -3,6 +3,7 @@
import django.shortcuts as shortcuts
from django.core.exceptions import ViewDoesNotExist
from models import Person, Building, Site, Membership, Entity
+from links.link_functions import object_links
from django.contrib.contenttypes.models import ContentType
@@ -180,7 +181,7 @@ def person(request, slug, active_tab = ""):
meta = {
"description": ", ".join([str(person), person_description])
}
- print meta
+ links = object_links(person)
return shortcuts.render_to_response(
"contacts_and_people/persondetails" + str(active_tab) + ".html",
{
@@ -198,6 +199,7 @@ def person(request, slug, active_tab = ""):
"active_tab": active_tab,
"multiple_entity_mode": multiple_entity_mode,
"meta": meta,
+ "links": links,
},
RequestContext(request),
)
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
No changes.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -183,7 +183,7 @@ def __unicode__(self):
class ExternalSite(models.Model):
class Meta:
ordering = ['site',]
- site = models.CharField(max_length=50,help_text = u"e.g. 'BBC News', 'Welsh Assembly Goverment', etc", blank = True)
+ site = models.CharField(max_length=50,help_text = u"e.g. 'BBC News', 'Welsh Assembly Goverment', etc", null = True)
domain = models.CharField(max_length=256, null = True, blank = True,)
parent = models.ForeignKey('self', blank=True, null = True, related_name='children') # for tree version of ExternalLinks
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 5a0bed6

Please sign in to comment.