Summary: Insert anchor-target hack to try to alleviate the problem of

OleLaursen · OleLaursen · commit c72d465438aa · 2015-02-17T15:17:05.000Z
the top menu covering the anchor target, also increase the width at
which content navigation menus disappear
 - Legacy-Id: 9093
diff --git a/ietf/templates/doc/document_ballot_content.html b/ietf/templates/doc/document_ballot_content.html
@@ -75,7 +75,7 @@ <h4><span class="label label-{{ n|pos_to_label }}"> {{ n.name }}</span></h4>
 
 		{% for n, positions in position_groups %}
 			{% for p in positions|dictsort:"ad.last_name" %}
-				<h4 id="{{ p.ad.plain_name|slugify }}">
+                                <h4 class="anchor-target" id="{{ p.ad.plain_name|slugify }}">
 					{% if p.old_ad %}<span class="text-muted">{% endif %}
 						{{ p.ad.plain_name }}
 					{% if p.old_ad %}</span>{% endif %}
diff --git a/ietf/templates/doc/document_history.html b/ietf/templates/doc/document_history.html
@@ -97,7 +97,7 @@ <h2>Document history</h2>
 
 	<tbody>
 		{% for e in events %}
-			<tr id="history-{{ e.pk }}">
+                        <tr class="anchor-target" id="history-{{ e.pk }}">
 				<td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
 				<td class="text-right">{{ e.rev }}</td>
 				<td>{{ e.by|escape }}</td>
diff --git a/ietf/templates/doc/index_active_drafts.html b/ietf/templates/doc/index_active_drafts.html
@@ -20,7 +20,7 @@ <h1>Active Internet-Drafts</h1>
 </p>
 
 {% for group in groups %}
-	<h2 id="{{ group.acronym }}">{{ group.name }} ({{ group.acronym }})</h2>
+        <h2 class="anchor-target" id="{{ group.acronym }}">{{ group.name }} ({{ group.acronym }})</h2>
 	{% for d in group.active_drafts %}
 		<p>
 			<b>{{ d.title }}.</b><br>
diff --git a/ietf/templates/doc/index_all_drafts.html b/ietf/templates/doc/index_all_drafts.html
@@ -33,7 +33,7 @@ <h2>Contents</h2>
 </ul>
 
 {% for state, heading, count, links in categories %}
-	<h2 id="{{ state.slug }}">{{ heading }} ({{ count }})</h2>
+        <h2 class="anchor-target" id="{{ state.slug }}">{{ heading }} ({{ count }})</h2>
 	<p class="links">{{ links|safe }}</p>
 {% endfor %}
 
diff --git a/ietf/templates/doc/relationship_help.html b/ietf/templates/doc/relationship_help.html
@@ -15,7 +15,7 @@ <h1>Document relationships</h1>
 	</thead>
 	<tbody>
 		{% for rel in relations %}
-			<tr id="{{ rel.slug }}">
+                        <tr class="anchor-target" id="{{ rel.slug }}">
 				<td class="name">{{ rel.name }}</td>
 				<td class="desc">{{ rel.desc|linebreaksbr }}</td>
 				<td class="revname">{{ rel.revname }}</td>
diff --git a/ietf/templates/doc/state_help.html b/ietf/templates/doc/state_help.html
@@ -19,7 +19,7 @@ <h1>{{ title }}</h1>
 	</thead>
 	<tbody>
 		{% for state in states %}
-		<tr id="{{ state.slug }}">
+                <tr class="anchor-target" id="{{ state.slug }}">
 			<th>{{ state.name }}</th>
 			<td>{{ state.desc|safe|linebreaksbr }}</td>
 			{% if has_next_states %}
@@ -47,7 +47,7 @@ <h2>Tags</h2>
 
 		<tbody>
 			{% for tag in tags %}
-				<tr id="{{ tag.slug }}">
+                                <tr class="anchor-target" id="{{ tag.slug }}">
 					<td>{{ tag.name }}</td>
 					<td>{{ tag.desc|linebreaksbr }}</td>
 				</tr>
diff --git a/ietf/templates/group/active_wgs.html b/ietf/templates/group/active_wgs.html
@@ -6,15 +6,15 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-sm-10">
+        <div class="col-md-10">
 
 <h1>Active IETF working groups</h1>
 
 <a class="btn btn-default" href="{% url "ietf.group.info.concluded_groups" %}">Concluded WGs</a>
 <a class="btn btn-default" href="//www.ietf.org/dyn/wg/charter/history/">Historic charters</a>
 
 {% for area in areas %}
-	<h2 id="{{area.acronym}}">{{ area.name }} ({{ area.acronym }})</h2>
+        <h2 class="anchor-target" id="{{area.acronym}}">{{ area.name }} ({{ area.acronym }})</h2>
 
         {% if area.ads %}
 		<h3>{{ area.acronym }} Area Director{{ area.ads|pluralize }} (AD{{ area.ads|pluralize }})</h3>
@@ -78,7 +78,7 @@ <h3>No active {{ area.acronym }} WGs</h3>
 {% endfor %}
 
 </div>
-<div class="col-sm-2 hidden-print bs-docs-sidebar" id="affix">
+<div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
 	<ul class="nav nav-pills nav-stacked small" data-spy="affix">
 		{% for area in areas %}
 		<li><a href="#{{area.acronym}}">{{ area.name }}</a></li>
diff --git a/ietf/templates/iesg/agenda.html b/ietf/templates/iesg/agenda.html
@@ -29,7 +29,7 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-sm-10">
+        <div class="col-md-10">
 
 <h1>IESG agenda: {{ date }} </h1>
 
@@ -40,9 +40,9 @@ <h1>IESG agenda: {{ date }} </h1>
 
 {% for num, section in sections %}
 
-{% if num|sectionlevel == 1 %}<h2 id="{{num}}">{{ num }}. {{ section.title|safe }}</h2>{% endif %}
-{% if num|sectionlevel == 2 %}<h3 id="{{num}}">{{ num }} {{ section.title|safe }}</h3>{% endif %}
-{% if num|sectionlevel == 3 %}<h4 id="{{num}}">{{ num }} {{ section.title|safe }}</h4>{% endif %}
+{% if num|sectionlevel == 1 %}<h2 class="anchor-target" id="{{num}}">{{ num }}. {{ section.title|safe }}</h2>{% endif %}
+{% if num|sectionlevel == 2 %}<h3 class="anchor-target" id="{{num}}">{{ num }} {{ section.title|safe }}</h3>{% endif %}
+{% if num|sectionlevel == 3 %}<h4 class="anchor-target" id="{{num}}">{{ num }} {{ section.title|safe }}</h4>{% endif %}
 
 {% if num == "1.4" %}
 <pre>
@@ -130,7 +130,7 @@ <h1>IESG agenda: {{ date }} </h1>
 {% endfor %}
 </div>
 
-<div class="col-sm-2 hidden-print bs-docs-sidebar" id="affix">
+<div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
 	<ul class="nav nav-pills nav-stacked small" data-spy="affix">
 		{% for num, section in sections %}
 			{% if num|sectionlevel <= 1 %}
diff --git a/ietf/templates/ipr/details_history.html b/ietf/templates/ipr/details_history.html
@@ -29,7 +29,7 @@ <h1>History for IPR disclosure<br><small>{{ ipr.title }}</small></h1>
 
     <tbody>
       {% for e in events %}
-        <tr id="history-{{ e.pk }}">
+        <tr class="anchor-target" id="history-{{ e.pk }}">
           <td class="text-nowrap">{{ e.time|date:"Y-m-d" }}</td>
           <td>{{ e.type }}
             {% if e.response_due and e.response_past_due %}
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html
@@ -8,7 +8,7 @@
 
 {% block content %}
   <div class="row">
-    <div class="col-sm-10">
+    <div class="col-md-10">
 
       <h1>Intellectual property rights disclosures</h1>
 
@@ -33,21 +33,21 @@ <h1>Intellectual property rights disclosures</h1>
         {% endif %}
       </p>
 
-      <h2 id="generic">Generic IPR disclosures</h2>
+      <h2 class="anchor-target" id="generic">Generic IPR disclosures</h2>
 
       {% include "ipr/ipr_table.html" with iprs=generic_disclosures %}
 
-      <h2 id="specific">Specific IPR disclosures</h2>
+      <h2 class="anchor-target" id="specific">Specific IPR disclosures</h2>
 
       {% include "ipr/ipr_table.html" with iprs=specific_disclosures %}
 
-      <h2 id="notify">Specific third-party IPR disclosures</h2>
+      <h2 class="anchor-target" id="notify">Specific third-party IPR disclosures</h2>
 
       {% include "ipr/ipr_table.html" with iprs=thirdpty_disclosures %}
 
     </div>
 
-    <div class="col-sm-2 hidden-print bs-docs-sidebar" id="affix">
+    <div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
       <ul class="nav nav-pills nav-stacked small" data-spy="affix">
 	<li><a href="#generic">Generic IPR disclosures</a></li>
 	<li><a href="#specific">Specific IPR disclosures</a></li>
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
@@ -148,7 +148,7 @@ <h2>
 		{% ifchanged item.timeslot.time|date:"Y-m-d" %}
 			<tr><th class="gap" colspan="6"></th></tr>
 			<tr class="warning">
-				<th colspan="6" id="{{item.timeslot.time|slugify}}">
+                                <th colspan="6" class="anchor-target" id="{{item.timeslot.time|slugify}}">
 					{% if "-utc" in request.path %}
 						{{ item.timeslot.utc_start_time|date:"l, F j, Y" }} (UTC)
 					{% else %}
diff --git a/ietf/templates/meeting/materials.html b/ietf/templates/meeting/materials.html
@@ -8,7 +8,7 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-sm-10">
+        <div class="col-md-10">
 
 <h1>IETF {{ meeting_num }} meeting materials</h1>
 
@@ -31,7 +31,7 @@ <h1>IETF {{ meeting_num }} meeting materials</h1>
 {% with "True" as show_agenda %}
 	<!-- Plenaries -->
 	{% if plenaries %}
-		<h2 id="plenaries">Plenaries</h2>
+                <h2 class="anchor-target" id="plenaries">Plenaries</h2>
 		<table class="table table-condensed table-striped">
 			<thead>
 				<tr>
@@ -53,7 +53,7 @@ <h2 id="plenaries">Plenaries</h2>
 	<!-- Working groups -->
 	{% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
 	{% for sessions in areas %}
-		<h2 id="{{sessions.list.0.group.parent.acronym}}">{{sessions.list.0.group.parent.acronym|upper}} <small>{{ sessions.grouper }}</small></h2>
+                <h2 class="anchor-target" id="{{sessions.list.0.group.parent.acronym}}">{{sessions.list.0.group.parent.acronym|upper}} <small>{{ sessions.grouper }}</small></h2>
 		<table class="table table-condensed table-striped">
 			<thead>
 				<tr>
@@ -77,7 +77,7 @@ <h2 id="{{sessions.list.0.group.parent.acronym}}">{{sessions.list.0.group.parent
 	<!-- Training Sessions -->
 	{% if training %}
 		{% with "False" as show_agenda %}
-		<h2 id="training">Training</h2>
+                <h2 class="anchor-target" id="training">Training</h2>
 		<table class="table table-condensed table-striped">
 			<thead>
 				<tr>
@@ -101,7 +101,7 @@ <h2 id="training">Training</h2>
 
 	<!-- IAB Sessions -->
 	{% if iab %}
-		<h2 id="iab">IAB <small>Internet Architecture Board</small></h2>
+                <h2 class="anchor-target" id="iab">IAB <small>Internet Architecture Board</small></h2>
 		<table class="table table-condensed table-striped">
 			<thead>
 				<tr>
@@ -124,7 +124,7 @@ <h2 id="iab">IAB <small>Internet Architecture Board</small></h2>
 
 	<!-- IRTF Sessions -->
 	{% if irtf %}
-		<h2 id="irtf">IRTF <small>Internet Research Task Force</small></h2>
+                <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</small></h2>
 		<table class="table table-condensed table-striped">
 			<thead>
 				<tr>
@@ -148,7 +148,7 @@ <h2 id="irtf">IRTF <small>Internet Research Task Force</small></h2>
 {% endcache %}
 </div>
 
-<div class="col-sm-2 hidden-print bs-docs-sidebar" id="affix">
+<div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
 	<ul class="nav nav-pills nav-stacked small" data-spy="affix">
 		{% if plenaries %}
 			<li><a href="#plenaries">Plenaries</a></li>
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
@@ -8,15 +8,15 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-sm-10">
+        <div class="col-md-10">
 
 <h1 class="title">IETF {{ meeting.number }} timeslot requests<br>
 <small>{{meeting.city}}, {{meeting.country}} -- {{meeting.venue_name}}</small>
 </h1>
 
 {% regroup sessions by group.parent as area_sessions %}
 {% for area in area_sessions %}
-	<h2 id="{{area.grouper.acronym}}">
+        <h2 class="anchor-target" id="{{area.grouper.acronym}}">
 			{{area.grouper.acronym|upper}} <small>{{area.grouper.name}}</small>
 	</h2>
 	<p class="alert alert-info">
@@ -106,7 +106,7 @@ <h2 id="{{area.grouper.acronym}}">
 	</table>
 {% endfor %}
 </div>
-<div class="col-sm-2 hidden-print bs-docs-sidebar" id="affix">
+<div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
 	<ul class="nav nav-pills nav-stacked small" data-spy="affix">
 		{% for area in area_sessions %}
 			<li><a href="#{{area.grouper.acronym}}">{{ area.grouper.acronym|upper }}</a></li>
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
@@ -8,7 +8,7 @@
 
 {% block content %}
 <div class="row">
-	<div class="col-sm-10">
+        <div class="col-md-10">
 
 
 <h1>IAB/IESG Nominating Committee</h1>
@@ -19,7 +19,7 @@ <h1>IAB/IESG Nominating Committee</h1>
 </p>
 
 {% for regime in regimes %}
-	<h2 id="{{ regime.group.start_year }}">Messages from {{ regime.group.start_year }}/{{ regime.group.end_year }}</h2>
+        <h2 class="anchor-target" id="{{ regime.group.start_year }}">Messages from {{ regime.group.start_year }}/{{ regime.group.end_year }}</h2>
 
 	{# use person email address here rather than the generic nomcom-chair@ietf.org #}
 	<p>
@@ -49,7 +49,7 @@ <h2 id="{{ regime.group.start_year }}">Messages from {{ regime.group.start_year
 
 
 {# somebody ought to import these announcements in the DB instead of this mess #}
-<h2 id="2003">Messages from 2003/2004</h2>
+<h2 class="anchor-target" id="2003">Messages from 2003/2004</h2>
 <p><b>Committee chair:</b> <a href="mailto:richdr@microsoft.com">Rich Draves</a></p>
 <table class="table table-condensed table-striped">
 	<thead>
@@ -78,7 +78,7 @@ <h2 id="2003">Messages from 2003/2004</h2>
 </table>
 
 
-<h2 id="2002">Messages from 2002/2003</h2>
+<h2 class="anchor-target" id="2002">Messages from 2002/2003</h2>
 <p><b>Committee chair:</b> <a href="mailto:PRoberts@MEGISTO.com">Phil Roberts</a></p>
 <table class="table table-condensed table-striped">
 	<thead>
@@ -101,13 +101,13 @@ <h2 id="2002">Messages from 2002/2003</h2>
 </table>
 
 
-<h2 id="historical">Historical information</h2>
+<h2 class="anchor-target" id="historical">Historical information</h2>
 <ul>
 	<li><a href="//www.ietf.org/nomcom/committee.html">IAB/IESG Nominating Committee Members (by year)</a></li>
 </ul>
 
 
-<h2 id="references">References</h2>
+<h2 class="anchor-target" id="references">References</h2>
 <ul>
 	<li><a href="//www.ietf.org/rfc/rfc2026.txt">The Internet Standards Process (RFC 2026)</a></li>
 	<li><a href="//www.ietf.org/rfc/rfc3777.txt">IAB and IESG Selection, Confirmation, and Recall Process: Operation of the Nominating and Recall </a>Committees (RFC 3777) (Also BCP10)</a>
@@ -116,7 +116,7 @@ <h2 id="references">References</h2>
 
 
 </div>
-<div class="col-sm-2 hidden-print bs-docs-sidebar" id="affix">
+<div class="col-md-2 hidden-print bs-docs-sidebar" id="affix">
 	<ul class="nav nav-pills nav-stacked small" data-spy="affix">
 		{% for regime in regimes %}
 			<li><a href="#{{ regime.group.start_year }}">{{ regime.group.start_year }}/{{ regime.group.end_year }}</a></li>
diff --git a/ietf/templates/submit/approvals.html b/ietf/templates/submit/approvals.html
@@ -7,7 +7,7 @@
 {% block submit_content %}
 
 {% if user.is_authenticated %}
-	<h2 id="approvals">Submissions you can approve</h2>
+        <h2 class="anchor-target" id="approvals">Submissions you can approve</h2>
 
 	{% if not approvals %}
 		<p>You don't have any submissions to approve.</p>
@@ -30,7 +30,7 @@ <h2 id="approvals">Submissions you can approve</h2>
 		</table>
 	{% endif %}
 
-	<h2 id="preapprovals">Pre-approved drafts not yet submitted</h2>
+        <h2 class="anchor-target" id="preapprovals">Pre-approved drafts not yet submitted</h2>
 
 	{% if user|has_role:"Secretariat,WG Chair,RG Chair" %}
 		<p><a class="btn btn-default" href="{% url "submit_add_preapproval" %}">Add pre-approval</a></p>
@@ -61,7 +61,7 @@ <h2 id="preapprovals">Pre-approved drafts not yet submitted</h2>
 		</table>
 	{% endif %}
 
-	<h2 id="recently-approved">Approved drafts within the past {{ days }} days</h2>
+        <h2 class="anchor-target" id="recently-approved">Approved drafts within the past {{ days }} days</h2>
 
 	{% if not recently_approved %}
 		<p>No drafts approved.</p>
diff --git a/static/css/ietf.css b/static/css/ietf.css
@@ -70,6 +70,17 @@ body { padding-top: 70px; }
 .nav-stacked>li>a { padding: 2px 8px; }
 .leftmenu .nav { overflow-wrap: break-word }
 
+/* Hack to make anchor-targets take up a bit more space vertically
+ to work around the position fixed navbar which otherwise covers them */
+.anchor-target:before {
+  content: '';
+  display: block;
+  position: relative;
+  width: 0;
+  height: 50px;
+  margin-top: -50px;
+}
+
 /* Style navbar buttons */
 .navbar-btn { color:#777; }
 .navbar-btn:hover { color: #333; }
