altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Cleanup action: replaced screaming html id with non-screaming version;

Browse source 
replaced the noTable block construct with start/end table_content blocks
in order to not have to open and close tables in different blocks, and
not have empty tables lying about.
 - Legacy-Id: 6439
This commit is contained in:
Henrik Levkowetz 2013-10-13 21:09:32 +00:00
parent 6d28eb180e
commit a7838d8765
16 changed files with 52 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ietf/templates/base.html
View file

@ -65,8 +65,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% endif %}</div>
{% endif %}
<div class="menu">
<table style="margin-left:8px;margin-top:8px; width:98%;" id="IETF_MENUBAR"> <!-- width="98%;"> this was causing issues.-->
{% block start_content_table %}
<table style="margin-left:8px;margin-top:8px; width:98%;" id="ietf_menubar">
<tr valign="top">
<td style="width:130px;padding-right:8px;" class="noprint">
<div class="ietf-navbar">
@ -80,11 +80,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<a href="http://tools.ietf.org/tools/ietfdb/newticket">Report a bug</a>
</div>
</td>
</div><!-- shouldn't this end menu class? -->
{% block noTable %} {% comment %} if we don't want a table we do this, make sure to close the tags inside. {% endcomment %}
<td>
{% endblock start_content_table %}
{% if messages %}
<ul class="messages">
{% for message in messages %}
@ -92,13 +89,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
{% endfor %}
</ul>
{% endif %}
{% block content %}
{% endblock %}
{% endblock %} {% comment %} Ends no table {% endcomment %}
<script type="text/javascript" src="/js/lib/jquery-1.8.2.min.js"></script>
<script type="text/javascript" src="/js/yui/yui-20100305.js"></script>
<script type="text/javascript">
@ -114,9 +107,10 @@ YAHOO.util.Event.onContentReady("wgs", function () {
{% block js %}{% endblock %}
{% block content_end %}
{% endblock %}
</div>
{% endblock %}
<div id="ietf-extras"></div>
{% block end_content_table %}
</td></tr></table>
{% endblock end_content_table %}
{% include "debug.html" %}
</body></html>

1
ietf/templates/base_leftmenu.html
View file

@ -139,4 +139,3 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
<li><a href="http://www.iana.org/">IANA</a></li>
<li><a href="http://www.irtf.org/">IRTF</a></li>
</ul>
<!-- end base_leftmenu -->

4
ietf/templates/meeting/agenda.html
View file

@ -113,7 +113,7 @@ You can customize the agenda below to show only selected working group sessions.
<div id='selector-{{wg.acronym}}' class="unselected" onclick="toggle(this)">{% if wg.state.name = "BOF" %}<i>{{wg.acronym}}</i>{% else %}{{wg.acronym}}{% endif %}</div>{% endfor %}
</td>
</tr>
<tr><td align="center" colspan="{{area_list.count}}">
<tr><td align="center" colspan="{{area_list|length}}">
Also show:
<input type="checkbox" class="include-checkbox" id="include-edu" onchange="toggle_special(this)"/>EDU &#8226;
<input type="checkbox" class="include-checkbox" id="include-ietf" onchange="toggle_special(this)"/>IETF &#8226;
@ -121,7 +121,7 @@ You can customize the agenda below to show only selected working group sessions.
<input type="checkbox" class="include-checkbox" id="include-iesg" onchange="toggle_special(this)"/>IESG &#8226;
<input type="checkbox" class="include-checkbox" id="include-iab" onchange="toggle_special(this)"/>IAB
<!-- </td></tr>
<tr><td align="center" colspan="{{area_list.count}}">
<tr><td align="center" colspan="{{area_list|length}}">
-->
<br/><i>Groups displayed in italics are BOFs</i></td></tr>
</table>

10
ietf/templates/meeting/agenda_list.html
View file

@ -30,10 +30,13 @@
<script type='text/javascript' src='/js/agenda/agendas_edit.js'></script>
{% endblock scripts %}
{% block noTable %}
</tr></table></div>
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div class="wrapper custom_text_stuff">
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
&lt;
</div>
@ -87,5 +90,4 @@
</div>
</div>
<table><tr>
{% endblock %}

6
ietf/templates/meeting/agenda_utc.html
View file

@ -76,7 +76,7 @@ img.hidden { display: none; }
{% block pagehead %}
<script type="text/javascript" src='/js/agenda2.js'></script>
<script type="text/javascript" src='/js/jquery-1.5.1.min.js'></script>
<script type="text/javascript" src='/js/jquery-1.8.2.min.js'></script>
<script type="text/javascript" src='/js/browsertime.js'></script>
<script type="text/javascript" src='/js/weekview.js'></script>
<script type="text/javascript" >
@ -129,7 +129,7 @@ You can customize the agenda below to show only selected working group sessions.
<div id='selector-{{wg.acronym}}' class="unselected" onclick="toggle(this)">{% if wg.state.name = "BOF" %}<i>{{wg.acronym}}</i>{% else %}{{wg.acronym}}{% endif %}</div>{% endfor %}
</td>
</tr>
<tr><td align="center" colspan="{{area_list.count}}">
<tr><td align="center" colspan="{{area_list|length}}">
Also show:
<input type="checkbox" class="include-checkbox" id="include-edu" onchange="toggle_special(this)"/>EDU &#8226;
<input type="checkbox" class="include-checkbox" id="include-ietf" onchange="toggle_special(this)"/>IETF &#8226;
@ -137,7 +137,7 @@ You can customize the agenda below to show only selected working group sessions.
<input type="checkbox" class="include-checkbox" id="include-iesg" onchange="toggle_special(this)"/>IESG &#8226;
<input type="checkbox" class="include-checkbox" id="include-iab" onchange="toggle_special(this)"/>IAB
<!-- </td></tr>
<tr><td align="center" colspan="{{area_list.count}}">
<tr><td align="center" colspan="{{area_list|length}}">
-->
<br/><i>Groups displayed in italics are BOFs</i></td></tr>
</table>

11
ietf/templates/meeting/landscape_edit.html
View file

@ -117,8 +117,11 @@ area_directors["{{ad.area}}"].push(find_person_by_href("{{ad.defurl}}"));
{% endblock scripts %}
{% block noTable %}
</tr></table></div>
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div id="read_only">
<p>
You do not have write permission to agenda: {{schedule.name}}
@ -157,7 +160,7 @@ Please save this agenda to your account first.
</select>
</div>
<div class="agenda_slot_title" >
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
&lt;
</div>
<b>Unassigned Events:</b>
@ -365,6 +368,4 @@ Please save this agenda to your account first.
</p>
</div>
<table><tr><td>
{% endblock %}

9
ietf/templates/meeting/private_agenda.html
View file

@ -14,8 +14,11 @@
{% block title %}IETF {{ meeting.number }} Meeting Agenda: {{ schedule.owner }} / {{ schedule.name }}{% endblock %}
{% load agenda_custom_tags %}
{% block noTable %}
</tr></table></div>
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div id="read_only">
<p>
You can not have access this agenda. It belongs to {{ schedule.owner }}.
@ -25,5 +28,5 @@ You can not have access this agenda. It belongs to {{ schedule.owner }}.
</p>
<div class="wrapper custom_text_stuff">
</div>
<table><tr><td>
{% endblock %}

9
ietf/templates/meeting/properties_edit.html
View file

@ -30,10 +30,13 @@
<script type='text/javascript' src='/js/agenda/agenda_properties_edit.js'></script>
{% endblock scripts %}
{% block noTable %}
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
</tr></table></div>
<div class="wrapper custom_text_stuff">
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
&lt;
</div>
@ -79,5 +82,5 @@
</div>
</div>
<table><tr><td>
{% endblock %}

1
ietf/templates/meeting/requests.html
View file

@ -45,6 +45,7 @@ th { text-align: right; vertical-align: text-top; }
{%ifchanged%}
<tr><td class="status" colspan="7"><!-- {{session.group.parent.id}} -->{{session.status}}</td></tr>
{%endifchanged%}
yes
<tr class="{% if forloop.counter|divisibleby:2 %}even{% else %}odd{% endif %}">
<th valign="top">{{session.group.acronym|upper}}</th>
<td valign="top" align="center">{% if not session.requested_duration %}<i>{{session.status}}</i>{%else%} {{session.requested_duration|stringformat:"s"|slice:"0:4"}} {% endif %}</td>

10
ietf/templates/meeting/timeslot_edit.html
View file

@ -70,10 +70,12 @@ function setup_slots(){
{% endblock scripts %}
{% block noTable %}
</tr></table></div>
{% block start_content_table %}{% endblock %}
{% block end_content_table %}{% endblock %}
{% block content %}
<div class="wrapper custom_text_stuff">
<div style="ui-icon ui-icon-arrow-1-w" id="CLOSE_IETF_MENUBAR">
<div style="ui-icon ui-icon-arrow-1-w" id="close_ietf_menubar">
&lt;
</div>
@ -168,5 +170,5 @@ function setup_slots(){
<button onclick="TowTruck(this); return false;">Start TowTruck</button>
{% endifnotequal %}
{% endif %}
<table><tr><td>
{% endblock %}

4
static/css/agenda.css
View file

@ -175,7 +175,7 @@ table.meeting_event {
}
#CLOSE_IETF_MENUBAR{
#close_ietf_menubar{
border-radius: 4px;
background-color:#2b95b5;
color:white;
@ -190,7 +190,7 @@ table.meeting_event {
}
#IETF_MENUBAR{
#ietf_menubar{
width:auto;
}

2
static/js/agenda/agenda_edit.js
View file

@ -59,7 +59,7 @@ var total_days = 0; // the number of days
$(document).ready(function() {
initStuff();
$("#CLOSE_IETF_MENUBAR").click();
$("#close_ietf_menubar").click();
});

8
static/js/agenda/agenda_listeners.js
View file

@ -424,7 +424,7 @@ function unassigned_sort_change(){
/* the functionality of these listeners will never change so they do not need to be run twice */
function static_listeners(){
$('#CLOSE_IETF_MENUBAR').click(hide_ietf_menu_bar);
$('#close_ietf_menubar').click(hide_ietf_menu_bar);
$('#unassigned_sort_button').unbind('change');
$('#unassigned_sort_button').change(unassigned_sort_change);
@ -769,19 +769,19 @@ function highlight_conflict(constraint) {
var menu_bar_hidden = false;
function hide_ietf_menu_bar(){
$('#IETF_MENUBAR').toggle('slide',"",100);
$('#ietf_menubar').toggle('slide',"",100);
if(menu_bar_hidden){
menu_bar_hidden = false;
$('.wrapper').css('width','auto');
$('.wrapper').css('margin-left','160px');
$('#CLOSE_IETF_MENUBAR').html("<");
$('#close_ietf_menubar').html("<");
}
else{
menu_bar_hidden = true;
$('.wrapper').css('width','auto');
$('.wrapper').css('margin-left','0px');
$('#CLOSE_IETF_MENUBAR').html(">");
$('#close_ietf_menubar').html(">");
}
}

2
static/js/agenda/agenda_properties_edit.js
View file

@ -27,7 +27,7 @@ $(document).ready(function() {
cancel_url = $("#agenda_cancel_url").attr("href");
/* hide the side bar by default. */
$("#CLOSE_IETF_MENUBAR").click();
$("#close_ietf_menubar").click();
});
function init_agenda_edit(){

2
static/js/agenda/agendas_edit.js
View file

@ -24,7 +24,7 @@ $(document).ready(function() {
init_agendas_edit();
/* hide the side bar by default. */
$("#CLOSE_IETF_MENUBAR").click();
$("#close_ietf_menubar").click();
});
/*

2
static/js/agenda/timeslot_edit.js
View file

@ -51,7 +51,7 @@ var total_days = 0; // the number of days
$(document).ready(function() {
init_timeslot_edit();
$("#CLOSE_IETF_MENUBAR").click();
$("#close_ietf_menubar").click();
});
/*