Merged in hotfixes (pull request #42)

Small UI fixes
This commit is contained in:
Tom Price
2015-05-31 16:35:06 +01:00
2 changed files with 3 additions and 1 deletions

View File

@@ -426,7 +426,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-12 text-right form-hws form-is_rig"> <div class="col-sm-12 text-right form-hws form-is_rig {% if object.pk and not object.is_rig %}hidden{% endif %}">
<div class="btn-group btn-page"> <div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span <button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span> class="glyphicon glyphicon-floppy-disk"></span>

View File

@@ -176,6 +176,8 @@
// Anti modal inception // Anti modal inception
if($link.parents('#modal').length == 0) { if($link.parents('#modal').length == 0) {
e.preventDefault(); e.preventDefault();
modaltarget = $link.data('target');
modalobject = "";
jQuery('#modal').load($link.attr('href'), function (e) { jQuery('#modal').load($link.attr('href'), function (e) {
jQuery('#modal').modal(); jQuery('#modal').modal();
}); });