Index: lams_central/web/main.jsp =================================================================== diff -u -r5199d1dc08051a94fead98f76b225edeb92f01f8 -r353fe07604639c2166ed68fbf832810959f3f3cf --- lams_central/web/main.jsp (.../main.jsp) (revision 5199d1dc08051a94fead98f76b225edeb92f01f8) +++ lams_central/web/main.jsp (.../main.jsp) (revision 353fe07604639c2166ed68fbf832810959f3f3cf) @@ -6,6 +6,7 @@ <%@ taglib uri="tags-core" prefix="c"%> <%@ taglib uri="tags-function" prefix="fn"%> <%@ taglib uri="tags-tiles" prefix="tiles" %> + @@ -14,12 +15,10 @@ - + - - @@ -84,13 +83,13 @@ PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '', MY_PROFILE : '', + REMOVE_ORG_FAVORITE : '', + MARK_ORG_FAVORITE : '', }, stateId = 1, // TODO Figure out when stateId is required to be equal 3. Old version code: stateId = tabName == 'profile' ? 3 : 1; - activeOrgId = -1; //not set for now + activeOrgId = null${lastVisitedOrganisationId}; $(document).ready(function(){ - initMainPage(); - <%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%> @@ -100,135 +99,39 @@ $.get("${disableAllTutorialVideosUrl}"); } - - var $tablesorter = $(".tablesorter").tablesorter({ - theme: 'bootstrap', - headerTemplate : '{content} {icon}', - widgets: ["filter"], - widgetOptions : { - filter_columnFilters: false - }, - widthFixed: true, - sortInitialOrder: 'desc', - sortList: [[1]], - headers: { 0: { sorter: false, filter: false} } - }); - - $.tablesorter.filter.bindSearch($tablesorter, $('#offcanvas-search-input') ); - - $(".tablesorter").each(function() { - $(this).tablesorterPager({ - savePages: false, - container: $(this).find(".ts-pager"), - output: '{startRow} to {endRow} ({totalRows})', - cssPageDisplay: '.pagedisplay', - cssPageSize: '.pagesize', - cssDisabled: 'disabled', - ajaxUrl : "?dispatch=getOrgs&page={page}&size={size}&{sortList:column}&{filterList:fcol}", - ajaxProcessing: function (data, table) { - if (data && data.hasOwnProperty('rows')) { - var rows = [], - json = {}; - - for (i = 0; i < data.rows.length; i++){ - var orgData = data.rows[i]; - var orgId = orgData["id"]; - - rows += ''; - - rows += ''; - rows += ''; - - rows += ''; - rows += ''; - rows += orgData["name"]; - rows += ''; - rows += ''; - - rows += ''; - } - - json.total = data.total_rows; - json.rows = $(rows); - return json; - } - } - }) - }); - - $('.tablesorter').bind('filterEnd pagerComplete', function(event, data){ - - //hide pager if total amount of courses is less than 10 - if (data.totalRows < 10) { - $(".tablesorter-pager").hide(); - } else { - $(".tablesorter-pager").show(); - } - - //in case active course is not yet chosen by user, select the fist one from the list - if ((activeOrgId < 0) && (event.type == "pagerComplete") && (data.totalRows > 0)) { - var firstOrgId = $('.tablesorter a').first().data("id"); - selectOrganisation(firstOrgId); - } - }); - }); - +class="offcanvas-hidden"> @@ -335,8 +238,6 @@ @@ -355,9 +256,7 @@