diff --git a/amadeus/static/js/mural.js b/amadeus/static/js/mural.js index 43615d1..8cdda61 100644 --- a/amadeus/static/js/mural.js +++ b/amadeus/static/js/mural.js @@ -22,7 +22,7 @@ $(function () { $(this).animate({scrollTop: height}, 0); }); - + postHeightLimits(); setUserDataPopover(); diff --git a/amadeus/static/js/mural_general.js b/amadeus/static/js/mural_general.js index 40b33be..f6b30cd 100644 --- a/amadeus/static/js/mural_general.js +++ b/amadeus/static/js/mural_general.js @@ -49,6 +49,26 @@ var loadPosts = function() { $(function () { $(window).bind('scroll', loadOnScroll); + $("input[name='favorite']").on('change', function () { + var checked = $(this).is(':checked'); + + $("input[name='favorite']").each(function () { + $(this).prop('checked', checked); + }); + + $("#post-filters").submit(); + }); + + $("input[name='mine']").on('change', function () { + var checked = $(this).is(':checked'); + + $("input[name='mine']").each(function () { + $(this).prop('checked', checked); + }); + + $("#post-filters").submit(); + }); + $(".clear_filter").click(function () { var frm = $(this).parent(); diff --git a/amadeus/static/js/mural_ungeneral.js b/amadeus/static/js/mural_ungeneral.js index e784f23..25d4d13 100644 --- a/amadeus/static/js/mural_ungeneral.js +++ b/amadeus/static/js/mural_ungeneral.js @@ -186,6 +186,17 @@ $('.mural-ungeneral').on('shown.bs.collapse', function(e) { return false; }); + var favorite = filters.find("input[name='favorite']"), + mine = filters.find("input[name='mine']"); + + favorite.on('change', function () { + filters.submit(); + }); + + mine.on('change', function () { + filters.submit(); + }); + clear_filters.click(function () { var frm = $(this).parent(); diff --git a/mural/templates/mural/list.html b/mural/templates/mural/list.html index 4357ebf..1674d08 100644 --- a/mural/templates/mural/list.html +++ b/mural/templates/mural/list.html @@ -36,8 +36,6 @@ {% trans 'Only my posts' %} - - @@ -84,8 +82,6 @@ {% trans 'Only my posts' %} - - @@ -100,4 +96,10 @@ +{% endblock %} + +{% block addtional_scripts %} + {% endblock %} \ No newline at end of file diff --git a/mural/templates/mural/list_category.html b/mural/templates/mural/list_category.html index 5c2c4fb..ef833a6 100644 --- a/mural/templates/mural/list_category.html +++ b/mural/templates/mural/list_category.html @@ -85,8 +85,6 @@ {% trans 'Only my posts' %} - - @@ -136,8 +134,6 @@ {% trans 'Only my posts' %} - - @@ -163,4 +159,10 @@ +{% endblock %} + +{% block addtional_scripts %} + {% endblock %} \ No newline at end of file diff --git a/mural/templates/mural/list_subject.html b/mural/templates/mural/list_subject.html index fd17fbb..e2965aa 100644 --- a/mural/templates/mural/list_subject.html +++ b/mural/templates/mural/list_subject.html @@ -84,8 +84,6 @@ {% trans 'Only my posts' %} - - @@ -135,8 +133,6 @@ {% trans 'Only my posts' %} - - @@ -164,4 +160,10 @@ +{% endblock %} + +{% block addtional_scripts %} + {% endblock %} \ No newline at end of file -- libgit2 0.21.2