Skip to content

Commit

Permalink
fixed openDialogBox issue on Firefox
Browse files Browse the repository at this point in the history
  • Loading branch information
@mikhuang
mikhuang committed Jun 12, 2013
1 parent 51958c7 commit 1192da8
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 158 deletions.
94 changes: 1 addition & 93 deletions deme_django/cms/templates/collection/show.html
View file
Expand Up @@ -2,100 +2,8 @@
{% load item_tags %}
{% block content %}


{% listgridbox base_item_type item %}

{% comment %}
<script type="text/javascript">
function openDialog(name)
{
var dialogBox = $("#" + name);
dialogBox.dialog({
autoOpen: false,
bgiframe: true,
modal: true,
close: function(event, ui) {dialogBox.dialog('destroy')}
});
dialogBox.dialog('open');
}
</script>
{% subclassfields %}

<form id="removememberform" method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="removemember",noun=item.pk %}?redirect={{ full_path|urlencode }}" style="display: none;">
<input type="hidden" name="item" value="" />
</form>

{% newmemberdialog %}

<form id="removeselfform" method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="removemember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
<input type="hidden" name="item" value="{{ cur_agent.pk }}" />
</form>

<form id="addselfform" method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="addmember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
<input type="hidden" name="item" value="{{ cur_agent.pk }}" />
</form>



<table id="jqgrid_list_collection_{{ item.pk }}"></table>
<div id="jqgrid_pager_collection_{{ item.pk }}"></div>
<script type="text/javascript">
$(document).ready(function () {
$("#jqgrid_list_collection_{{ item.pk }}").jqGrid({
url: '{% url item_type_url viewer="item",action="grid",format="json" %}',
postData: {
fields: 'name,creator,created_at',
filter: 'memberships.collection.{{ item.pk }}',
},
datatype: "json",
colNames: [
'Item name',
'Creator',
'Created at',
'Actions',
],
colModel: [
{name: 'name', index: 'name'},
{name: 'creator', index: 'creator'},
{name: 'created_at', index: 'created_at'},
{name: 'actions', index: 'actions', sortable: false},
],
rowNum: 50,
rowList: [10,20,50,100],
viewrecords: true,
pager: '#jqgrid_pager_collection_{{ item.pk }}',
height: "100%",
autowidth: true,
gridComplete: function(){
var ids = $("#jqgrid_list_collection_{{ item.pk }}").getDataIDs();
for (var i = 0; i < ids.length; i++) {
var id = ids[i];
var deleteButton = '<button type="button" onclick="$(\'#removememberform\')[0].elements[0].value = '+id+'; $(\'#removememberform\')[0].submit();"><span class="ui-icon ui-icon-trash"></span></button>';
{% ifagentcan 'modify_membership' item %}
$("#jqgrid_list_collection_{{ item.pk }}").setRowData(id, {actions: deleteButton});
{% endifagentcan %}
}
},
});
$("#jqgrid_list_collection_{{ item.pk }}").jqGrid('navGrid','#jqgrid_pager_collection_{{ item.pk }}',{edit:false,add:false,del:false});
$("#jqgrid_list_collection_{{ item.pk }}").jqGrid('navButtonAdd',"#jqgrid_pager_collection_{{ item.pk }}",{caption:"Columns",title:"Choose columns",buttonicon:"ui-icon-gear",onClickButton:function(){$("#jqgrid_list_collection_{{ item.pk }}").jqGrid('columnChooser',{});}});

{% ifagentcan 'modify_membership' item %}
$("#jqgrid_list_collection_{{ item.pk }}").jqGrid('navButtonAdd',"#jqgrid_pager_collection_{{ item.pk }}",{caption:"Add",title:"Add an item to {% viewable_name item %}",buttonicon:"ui-icon-circle-plus",onClickButton:function(){openDialog('addmember{{ item.pk }}');}})
{% endifagentcan %}

{% if cur_agent_in_collection %}
{% ifagentcan 'remove_self' item %}
$("#jqgrid_list_collection_{{ item.pk }}").jqGrid('navButtonAdd',"#jqgrid_pager_collection_{{ item.pk }}",{caption:"Leave",title:"Remove my membership in {% viewable_name item %}",buttonicon:"ui-icon-person",onClickButton:function(){$('#removeselfform')[0].submit();}})
{% endifagentcan %}
{% else %}
{% ifagentcan 'add_self' item %}
$("#jqgrid_list_collection_{{ item.pk }}").jqGrid('navButtonAdd',"#jqgrid_pager_collection_{{ item.pk }}",{caption:"Join",title:"Become a member of {% viewable_name item %}",buttonicon:"ui-icon-person",onClickButton:function(){$('#addselfform')[0].submit();}})
{% endifagentcan %}
{% endif %}
});
</script>
{% endcomment %}
{% listgridbox base_item_type item %}

{% endblock content %}

19 changes: 3 additions & 16 deletions deme_django/cms/templates/templatetags/listgridbox.html
View file
Expand Up @@ -15,20 +15,6 @@
</div>
<script type="text/javascript">

if (typeof(openDialog) == 'undefined') {
function openDialog(name)
{
var dialogBox = $("#" + name);
dialogBox.dialog({
autoOpen: false,
bgiframe: true,
modal: true,
close: function(event, ui) {dialogBox.dialog('destroy')}
});
dialogBox.dialog('open');
}
}

$(document).ready(function () {
var jqgrid_list = $("#jqgrid_list{{identifier}}");
window.jql = jqgrid_list;
Expand Down Expand Up @@ -86,7 +72,7 @@
jqgrid_list.jqGrid('navButtonAdd',"#jqgrid_pager{{identifier}}",{caption:"Columns",title:"Choose columns",buttonicon:"ui-icon-gear",onClickButton:function(){jqgrid_list.jqGrid('columnChooser',{});}});
{% if collection_item %}
{% ifagentcan 'modify_membership' collection_item %}
jqgrid_list.jqGrid('navButtonAdd',"#jqgrid_pager{{identifier}}",{caption:"Add",title:"Add an item to {% viewable_name collection_item %}",buttonicon:"ui-icon-circle-plus",onClickButton:function(){openDialog('addmember{{collection_item.pk}}');}})
jqgrid_list.jqGrid('navButtonAdd',"#jqgrid_pager{{identifier}}",{caption:"Add",title:"Add an item to {% viewable_name collection_item %}",buttonicon:"ui-icon-circle-plus",onClickButton:function(){openDialogBox('addmember{{collection_item.pk}}');}})
{% endifagentcan %}

{% if cur_agent_in_collection %}
Expand All @@ -102,11 +88,12 @@

// multi actions
multi.on('click', '.action-add-to-collection', function(e){
console.log('panties')
e.preventDefault();
var sel = jqgrid_list.jqGrid('getGridParam','selarrrow');
// populate vars
$('#multiadd{{identifier}}').find('[name="items"]').val(sel);
openDialog('multiadd{{identifier}}');
openDialogBox('multiadd{{identifier}}');
});

multi.on('click', '.action-reactivate', function(e){
Expand Down
20 changes: 10 additions & 10 deletions deme_django/modules/event/templates/calendar/show.html
View file
Expand Up @@ -7,7 +7,7 @@


<script type="text/javascript">
function openDialog(name, edit_url)
function openDialogCalendar(name, edit_url)
{
var dialogBox = $("#" + name);
dialogBox.dialog({
Expand All @@ -24,7 +24,7 @@
close: function(event, ui) {dialogBox.dialog('destroy')}
});
dialogBox.dialog('open');
}
}

function GoToMonth()
{
Expand All @@ -44,7 +44,7 @@
background: #eef;
}

.day {
.day {
width: 14%;
height: 70px;
color: #456;
Expand Down Expand Up @@ -79,12 +79,12 @@ <h3 align="center">{{ this_month|date:"M Y" }}</h3>
<th>Fri</th>
<th>Sat</th>
</tr>

<tbody>
{% for weeks_events in week_list %}
<tr valign="top">
{% for days_events in weeks_events %}
<td class="day" {% if days_events.is_today %} style="background: lightblue;" {% endif %}>
<td class="day" {% if days_events.is_today %} style="background: lightblue;" {% endif %}>
{% if days_events.in_cur_month %}
{{ days_events.day.day }}
{% else %}
Expand All @@ -98,22 +98,22 @@ <h3 align="center">{{ this_month|date:"M Y" }}</h3>
{% if event.is_starting_date %}
{{ event.start_time|time:"P" }}
{% endif %}
<a href="{{ event.url }}" onclick="openDialog('{{ event.pk }}-{{ days_events.day.day }}', '{{ event.edit_url }}'); return false;">{{ event.name }}</a>
<a href="{{ event.url }}" onclick="openDialogCalendar('{{ event.pk }}-{{ days_events.day.day }}', '{{ event.edit_url }}'); return false;">{{ event.name }}</a>
<div id="{{ event.pk }}-{{ days_events.day.day }}" title="<a href='{{ event.url }}'>{{ event.name }}</a>" style="display: none;">
Start Time: {{ event.start_time|time:"P" }}
<p>Start Date: {{ event.start_date|date:"M d, Y" }}</p>
End Time: {{ event.end_time|time:"P" }}
<p>End Date: {{ event.end_date|date:"M d, Y" }}</p>
Location: {{ event.location }}
<p>Description: {{ event.body|safe|truncatewords_html:50 }}</p>
<a href="{{ event.url }}" style="color: blue;">View the full event</a>
<a href="{{ event.url }}" style="color: blue;">View the full event</a>
</div>
</div>
{% endfor %}
</td>
{% endfor %}
</tr>
{% endfor %}
{% endfor %}
</tbody>

</table>
Expand All @@ -128,11 +128,11 @@ <h3 align="center">{{ this_month|date:"M Y" }}</h3>
</div>
<div style="text-align: center; border-top: 1px solid black; padding: 4px; margin-top: 5px; margin-right: 40px;">
{% ifagentcan 'modify_membership' collection %}
<a href="{% url item_type_url viewer="event",action="new" %}?add_to_collection={{ collection.pk }}&redirect={{ redirect|urlencode }}">Add A New Event to this Calendar ||</a>
<a href="{% url item_type_url viewer="event",action="new" %}?add_to_collection={{ collection.pk }}&redirect={{ redirect|urlencode }}">Add A New Event to this Calendar ||</a>
{% endifagentcan %}

<a href="{% url item_url viewer="calendar" action="exportguide" noun=collection.pk %}">Export this Calendar ||</a>
<a href="{% url item_url viewer="newsroll" action="show" noun=collection.pk %}">View a listing of this calendar's events</a>
<a href="{% url item_url viewer="newsroll" action="show" noun=collection.pk %}">View a listing of this calendar's events</a>
</div>

{% endblock %}
60 changes: 21 additions & 39 deletions deme_django/modules/poll/templates/poll/choosenpoll.html
View file
Expand Up @@ -131,7 +131,7 @@
$(button).val("Show Responses");
}
};

function toggleButtons(className){
var buttons = "#" + className;
if ($(buttons).is(":hidden")) {
Expand All @@ -140,13 +140,13 @@
$(buttons).slideUp("slow");
}
};

function removeMember(pk){
$("#removeInput").val(pk);
$("#removemember").submit();
};


</script>
<form id="removemember" style="display: inline;" method="post" enctype="multipart/form-data" action="{% url item_url viewer=viewer_name,action="removemember",noun=item.pk %}?redirect={{ full_path|urlencode }}" class="item_form">
<input id="removeInput"type="hidden" name="item" value="{{ membership.item.pk }}" />
Expand Down Expand Up @@ -180,7 +180,7 @@
<p>Unanimous Aggregation: unanimous minus m [where m <= #Poll] </p>
</div>
<div id="hiddenDecisionButtons" style="display: none; width: 150%;">
{% ifagentcanglobal 'create PluralityChooseNDecision' %}
{% ifagentcanglobal 'create PluralityChooseNDecision' %}
<p><a href="{% url item_type_url viewer='pluralitychoosendecision',action='new'%}?populate_poll={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Plurality Aggregation</a></p>
{% endifagentcanglobal %}
{% ifagentcanglobal 'create ThresholdChooseNDecision' %}
Expand All @@ -198,7 +198,7 @@
</div>


<div class='Question' style="width: 50%">
<div class='Question' style="width: 50%">
{% ifagentcan 'view Poll.question' item %}
<p>{{ item.question }}</p>
{% else %}
Expand Down Expand Up @@ -230,30 +230,12 @@
{% endifagentcan %}
</div>



<script type="text/javascript">
function openDialog(name)
{
var dialogBox = $("#" + name);
dialogBox.dialog({
autoOpen: false,
bgiframe: true,
modal: true,
close: function(event, ui) {dialogBox.dialog('destroy')}
});
dialogBox.dialog('open');
} =me
</script>



{% if propositions %}
<form method="post" enctype="multipart/form-data"
<form method="post" enctype="multipart/form-data"
action="{% url item_url viewer=viewer_name,action="respondtopropositions",noun=item.pk %}?redirect={{ full_path|urlencode }}">
<div class="container propositions" id="Propcontainer" style="width: 78%; margin-left: 0; ">


{% for proposition in propositions %}
<div class="{% cycle 'even' 'odd' %} row ">
<div class='description' style="float:left"><span class="row"> <a style="width=100px; overflow:hidden;" href="{{ proposition.get_absolute_url }}?crumb_filter=memberships.collection.{{ item.pk }}">{% viewable_name proposition %}</a><br>
Expand All @@ -263,17 +245,17 @@
<select name="{{ proposition.pk }}">
<option value="not chosen">Not Chosen</option>
<option value="chosen">Chosen</option>
</select>
</select>
{% endif %}
<input type="button" value="Show Details" id="hide{{ proposition.pk }}" onclick="toggleImplementation('{{ proposition.pk }}')" />
<input type="button" value="Show Details" id="hide{{ proposition.pk }}" onclick="toggleImplementation('{{ proposition.pk }}')" />
{% ifagentcan 'modify_membership' item %}
<button type="button" onclick="removeMember('{{ proposition.pk }}')"><img src="{{ "delete"|icon_url:16 }}" /> Remove</button>
{% endifagentcan %}<div style="clear: both;"></div>
{% endifagentcan %}<div style="clear: both;"></div>

</div></span></div>

<div class="implementation"id="{{ proposition.pk }}">
<a href="{{ proposition.get_absolute_url }}">View as an item</a>{{proposition.body|safe}}
<a href="{{ proposition.get_absolute_url }}">View as an item</a>{{proposition.body|safe}}
</div>
{% endfor %}
{% if cur_agent_in_eligbles %}
Expand All @@ -289,7 +271,7 @@


{% ifagentcan 'modify_membership' item %}
<div class="submit_button">
<div class="submit_button">
<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" onclick="toggleButtons('hiddenPropositionButtons')">Add a Proposition</a>
</div>
{% endifagentcan %}
Expand All @@ -300,7 +282,7 @@
<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" href="{% url item_type_url viewer='proposition',action='new'%}?populate_poll={{ item.pk }}&amp;add_to_collection={{ item.pk }}&amp;redirect={{ full_path|urlencode }}">Make New Proposition</a>
{% endifagentcanglobal %}
{% ifagentcan 'modify_membership' item %}
<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" onclick="openDialog('addmember{{ item.pk }}'); return false;">Add Existing Proposition to Poll</a>
<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" onclick="openDialogBox('addmember{{ item.pk }}'); return false;">Add Existing Proposition to Poll</a>
{% endifagentcan %}
<a class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all poll" onclick="toggleButtons('hiddenPropositionButtons')">Cancel</a><br><br>
</div>
Expand All @@ -315,7 +297,7 @@
<div class="{% cycle 'even' 'odd' %} row " >
<span class="row"><a href="{{ key.get_absolute_url }}">{% viewable_name key %}</a>
{% if value %}
has responded
has responded
<input type="button" style="float:right;"
value="Show Responses" id="hide{{ key.pk }}" onclick="toggleResponses('{{ key.pk }}')" />
</div>
Expand All @@ -335,7 +317,7 @@
<div class="{% cycle 'even' 'odd' %} row " >
<span class="row"><a href="{{ key.get_absolute_url }}">{% viewable_name key %}</a>
{% if value %} has responded {% else %} has not responded {% endif %}
{% ifequal cur_agent key %}
{% ifequal cur_agent key %}
<input type="button" style="float:right;"
value="Show Responses" id="hide{{ key.pk }}" onclick="toggleResponses('{{ key.pk }}')" />
</div>
Expand All @@ -351,12 +333,12 @@
Responses are not visible
<p>You're response:</p>
{% for key,value in responses.items %}

{% ifequal cur_agent.pk key.pk %}
<div class="{% cycle 'even' 'odd' %} row " >
<span class="row"><a href="{{ key.get_absolute_url }}">{% viewable_name key %}</a>
{% if value %}
has responded
has responded
<input type="button" style="float:right;"
value="Show Responses" id="hide{{ key.pk }}" onclick="toggleResponses('{{ key.pk }}')" />
</div>
Expand Down
1 change: 1 addition & 0 deletions deme_django/static/javascripts/deme/jqgrid-helpers-ck.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions deme_django/static/javascripts/deme/jqgrid-helpers.js
View file
@@ -1,3 +1,13 @@
function openDialogBox(name) {
var dialogBox = $("#" + name);
dialogBox.dialog({
autoOpen: false,
bgiframe: true,
modal: true,
close: function(event, ui) {dialogBox.dialog('destroy')}
});
dialogBox.dialog('open');
}
$(function(){
// watch for the window resizing, then resize all jqgrids on page
$(window).resize(function(){
Expand Down

0 comments on commit 1192da8

Please sign in to comment.