Michael Hall has proposed merging
lp:~mhall119/loco-directory/newstyle_inclusion_fix into lp:loco-directory with
lp:~mhall119/loco-directory/migration_updatetime_fix as a prerequisite.
Requested reviews:
loco-directory-dev (loco-directory-dev)
Fixes to the way newstyle.css is being included so that we actually get the
960px changes
--
https://code.launchpad.net/~mhall119/loco-directory/newstyle_inclusion_fix/+merge/35027
Your team loco-directory-dev is requested to review the proposed merge of
lp:~mhall119/loco-directory/newstyle_inclusion_fix into lp:loco-directory.
=== modified file 'loco_directory/templates/base.html'
--- loco_directory/templates/base.html 2010-09-01 15:50:09 +0000
+++ loco_directory/templates/base.html 2010-09-09 19:12:45 +0000
@@ -6,6 +6,7 @@
{% block logo_text %}{% trans "LoCo Team Directory" %}{% endblock %}
{% block extrahead %}
+ <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/newstyle.css" />
<script type="text/javascript" src="{{MEDIA_URL}}/jquery/jquery.js"></script>
{% endblock %}
=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/events/global_event_detail.html 2010-09-09 19:12:45 +0000
@@ -1,8 +1,7 @@
{% extends "base.html" %}
{% load i18n %}
-{% block extrahead %}
-{{block.super}}
+{% block extrahead %}{{block.super}}
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
{% endblock %}
=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html 2010-09-08 21:48:47 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html 2010-09-09 19:12:45 +0000
@@ -1,5 +1,5 @@
{% load i18n %}
-{% block extrahead %}
+{% block extrahead %}{{ block.super }}
{% if global_event_object.pictag %}
<link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html 2010-09-01 16:58:11 +0000
+++ loco_directory/templates/index.html 2010-09-09 19:12:45 +0000
@@ -8,8 +8,7 @@
{% block search %}{% endblock %}
-{% block extrahead %}
-{{block.super}}
+{% block extrahead %}{{block.super}}
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/continents.css" />
{% endblock %}
=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html 2010-09-01 22:06:33 +0000
+++ loco_directory/templates/teams/team_detail.html 2010-09-09 19:12:45 +0000
@@ -12,7 +12,7 @@
{% block search %}{% endblock %}
-{% block extrahead %}
+{% block extrahead %}{{ block.super }}
{% if team.flickr_id %}
<script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
<script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/teams/team_event_list.html 2010-09-09 19:12:45 +0000
@@ -11,7 +11,7 @@
{% block search %}{% endblock %}
-{% block extrahead %}
+{% block extrahead %}{{ block.super }}
<link type="application/rss+xml" rel="alternate" title="Team Events (RSS)" href="{% url team-events-rss team_object.lp_name %}" />
{% endblock %}
=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/venues/venue_detail.html 2010-09-09 19:12:45 +0000
@@ -3,8 +3,7 @@
{% block title %}{% trans venue_object.name %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
-{% block extrahead %}
-{{block.super}}
+{% block extrahead %}{{block.super}}
<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js";></script>
<script src="http://maps.google.com/maps?file=api&v=2&key={{ google_api_key }}" type="text/javascript"></script>
<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js";></script>
=== modified file 'loco_directory/templates/venues/venue_update.html'
--- loco_directory/templates/venues/venue_update.html 2010-08-21 21:07:34 +0000
+++ loco_directory/templates/venues/venue_update.html 2010-09-09 19:12:45 +0000
@@ -6,8 +6,7 @@
{% block sub_nav %}
{% endblock %}
-{% block extrahead %}
-{{block.super}}
+{% block extrahead %}{{block.super}}
<script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js";></script>
<script src="http://maps.google.com/maps?file=api&v=2&key={{ google_api_key }}" type="text/javascript"></script>
<script src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js";></script>
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
