checked filtering by last user activity for #65

SaftigeKumquat · Aug 25, 2012 · b49f4a6 · b49f4a6
1 parent 995dedf
commit b49f4a6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/inis.js b/inis.js
@@ -95,8 +95,9 @@ var inis = function(state, render) {
 	}
 
 	// check if timeline page
-	if(state.url.query.timeline !== undefined)
+	if(state.url.query.timeline !== undefined) {
 		state.context.initable.isTimeline = state.url.query.timeline;
+	}
 
 	/**
 	 * Internal data collection callback.
@@ -180,10 +181,10 @@ var inis = function(state, render) {
 	// get last events
  	lf.query('/event', {}, state, function(res) {
 		// calculate number of pages
-		var foundissues = [];
-		var foundissue = false;
-		for(var i = 0; i < res.result.length; i++) {
+		foundissues = [];
+		for(var i = 0; i < res.result.length; i++) {			
 			foundissue = false;
+
 			for(var j = 0; j < foundissues.length; j++) {
 				if(foundissues[j] == res.result[i].issue_id) {
 					foundissue = true;

diff --git a/templates/main.tpl b/templates/main.tpl
@@ -63,13 +63,15 @@
 			<div id="inipages" class="box-footer">
 				<ul class="pagination">
 					<% if(initable.activepage == 1) { %><li class="button button-backward-off"><%= texts.backshort %></li><% } else { %><li><a class="button button-backward" href="<%= meta.baseurl %>/overview?page=<%= ( initable.activepage - 1 ) %>&newspage=<%= news.activepage %>" onClick="update_inis(<%= ( initable.activepage - 1 ) %>, false)"><%= texts.backshort %></a></li><% }
-					for(var i = 1; i <= initable.pages; i++) {
-						if(i == initable.activepage) { %>
-							<li class="active"><%= i %></li>
-						<% }
-						else { %>
-							<li><a href="<%= meta.baseurl %>/overview?page=<%= i %>&newspage=<%= news.activepage %>" onClick="update_inis(<%= i %>, false)"><%= i %></a></li>
-						<% }
+					if(initable.pages > 1) {					
+						for(var i = 1; i <= initable.pages; i++) {
+							if(i == initable.activepage) { %>
+								<li class="active"><%= i %></li>
+							<% }
+							else { %>
+								<li><a href="<%= meta.baseurl %>/overview?page=<%= i %>&newspage=<%= news.activepage %>" onClick="update_inis(<%= i %>, false)"><%= i %></a></li>
+							<% }
+						}
 					}
 					var nextpage = ( initable.activepage - 1 ) + 2;
 					if(initable.activepage < initable.pages) { %><li><a class="button button-forward" href="<%= meta.baseurl %>/overview?page=<%= nextpage %>&newspage=<%= news.activepage %>" onClick="update_inis(<%= nextpage %>, false)"><%= texts.forward %></a></li><% } else { %><li class="button button-forward-off"><%= texts.forward %></li><% } %>

diff --git a/templates/timeline.tpl b/templates/timeline.tpl
@@ -361,13 +361,15 @@
 			<div id="inipages" class="box-footer">
 				<ul class="pagination">
 					<% if(initable.activepage == 1) { %><li class="button button-backward-off"><%= texts.backshort %></li><% } else { %><li><a class="button button-backward" href="<%= meta.baseurl %>/timeline?page=<%= ( initable.activepage - 1 ) %>" onClick="update_inis(<%= ( initable.activepage - 1 ) %>, true)"><%= texts.backshort %></a></li><% }
-					for(var i = 1; i <= initable.pages; i++) {
-						if(i == initable.activepage) { %>
-							<li class="active"><%= i %></li>
-						<% }
-						else { %>
-							<li><a href="<%= meta.baseurl %>/timeline?page=<%= i %>" onClick="update_inis(<%= i %>, true)"><%= i %></a></li>
-						<% }
+					if(initable.pages > 1) {
+						for(var i = 1; i <= initable.pages; i++) {
+							if(i == initable.activepage) { %>
+								<li class="active"><%= i %></li>
+							<% }
+							else { %>
+								<li><a href="<%= meta.baseurl %>/timeline?page=<%= i %>" onClick="update_inis(<%= i %>, true)"><%= i %></a></li>
+							<% }
+						}
 					}
 					var nextpage = ( initable.activepage - 1 ) + 2;
 					if(initable.activepage < initable.pages) { %><li><a class="button button-forward" href="<%= meta.baseurl %>/timeline?page=<%= nextpage %>" onClick="update_inis(<%= nextpage %>, true)"><%= texts.forward %></a></li><% } else { %><li class="button button-forward-off"><%= texts.forward %></li><% } %>

diff --git a/user.js b/user.js
@@ -58,6 +58,7 @@ var user = function(state, finish, allowOtherMember) {
 			'statement': lf_user.statement,
 			'offices': lf_user.internal_posts,
 			'memberships': lf_user.external_memberships,
+			'lastactive': lf_user.last_activity
 		};
 
 		// delete dummy content