fixup for new theme design in public.php

darcs-hash:20080610192101-84dde-29ba2cc875b73131bbbbef4cbdfb17965df37677.gz

1 files changed, 35 insertions, 5 deletions

diff --git a/lib/util.php b/lib/util.php
index a194e09ef..cbf60619d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -204,8 +204,7 @@ function common_raw($xml) {
 
 function common_license_block() {
 	global $config, $xw;
-	common_element_start('p', 'license greenBg');
-	common_element_start('span', 'floatLeft width25');
+	common_element_start('p', 'license');
 	common_element_start('a', array('class' => 'license',
 									'rel' => 'license',
 									href => $config['license']['url']));
@@ -213,15 +212,12 @@ function common_license_block() {
 								'src' => $config['license']['image'],
 								'alt' => $config['license']['title']));
 	common_element_end('a');
-	common_element_end('span');
-	common_element_start('span', 'floatRight width75');
 	common_text(_t('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
 	common_element('a', array('class' => 'license',
 							  'rel' => 'license',
 							  href => $config['license']['url']),
 				   $config['license']['title']);
 	common_text(_t('. Contributors should be attributed by full name or nickname.'));
-	common_element_end('span');
 	common_element_end('p');
 }
 
@@ -701,3 +697,37 @@ function common_valid_tag($tag) {
 	}
 	return false;
 }
+
+# Does a little before-after block for next/prev page
+
+function common_pagination($have_before, $have_after, $page, $action, $args=NULL) {		
+	
+	if ($have_before || $have_after) {
+		common_element_start('div', array('id' => 'pagination'));
+		common_element_start('ul', array('id' => 'nav_pagination'));
+	}
+	
+	if ($have_before) {
+		$pargs = array('page' => $page-1);
+		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+										 
+		common_element_start('li', 'before');
+		common_element('a', array('href' => common_local_url($action, $newargs)),
+					   _t('« Before'));
+		common_element_end('li');
+	}
+
+	if ($have_after) {
+		$pargs = array('page' => $page+1);
+		$newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+		common_element_start('li', 'after');
+		common_element('a', array('href' => common_local_url($action, $newargs)),
+						   _t('After »'));
+		common_element_end('li');
+	}
+	
+	if ($have_before || $have_after) {
+		common_element_end('ul');
+		common_element_end('div');
+	}
+}