X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Futil.php;h=def3a57506f9037c4d85fea46bd23ae15cb6f2ab;hb=9f39fd31afe198fc78c669088710af64a9976c3d;hp=250857912776175e5fe6eba35e1cafde7a2c4765;hpb=8ddb25e1a71b219e06120713be4adc50639202d0;p=quix0rs-gnu-social.git

diff --git a/lib/util.php b/lib/util.php
index 2508579127..def3a57506 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -123,7 +123,7 @@ function common_end_xml() {
 	$xw->flush();
 }
 
-function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
+function common_show_header($pagetitle, $callable=NULL, $data=NULL, $notice=NULL) {
 	global $config, $xw;
 
 	header('Content-Type: application/xhtml+xml');
@@ -143,16 +143,15 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
 				   $pagetitle . " - " . $config['site']['name']);
 	common_element('link', array('rel' => 'stylesheet',
 								 'type' => 'text/css',
-								 'href' => common_path('theme/default/style/html.css'),
+								 'href' => theme_path('display.css'),
 								 'media' => 'screen, projection, tv'));
-	common_element('link', array('rel' => 'stylesheet',
-								 'type' => 'text/css',
-								 'href' => common_path('theme/default/style/layout.css'),
-								 'media' => 'screen, projection, tv'));
-	common_element('link', array('rel' => 'stylesheet',
-								 'type' => 'text/css',
-								 'href' => common_path('theme/default/style/print.css'),
-								 'media' => 'print'));
+	foreach (array(6,7) as $ver) {
+		if (file_exists(theme_file('ie'.$ver.'.css'))) {
+			# Yes, IE people should be put in jail.
+			$xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
+							  'href="'.theme_path('ie'.$ver.'.css').' /><![endif]');
+		}
+	}
 	if ($callable) {
 		if ($data) {
 			call_user_func($callable, $data);
@@ -162,23 +161,38 @@ function common_show_header($pagetitle, $callable=NULL, $data=NULL) {
 	}
 	common_element_end('head');
 	common_element_start('body');
-	common_element_start('div', array('id' => 'wrapper'));
-	common_element_start('div', array('id' => 'content'));
+	common_element_start('div', array('id' => 'wrap'));
 	common_element_start('div', array('id' => 'header'));
-	common_element('h1', 'title', $pagetitle);
-	common_element('h2', 'subtitle', $config['site']['name']);
+	common_nav_menu();
+	common_element_start('a', array('href' => common_local_url('public')));
+	common_element('img', array('src' => ($config['site']['logo']) ? 
+								($config['site']['logo']) : theme_path('logo.png'),
+								'alt' => $config['site']['name'],
+								'id' => 'logo'));
+	common_element_end('a');
+	if (common_logged_in()) {
+		common_notice_form();
+	}
 	common_element_end('div');
-	common_head_menu();
-	common_element_start('div', array('id' => 'page'));
+	common_element_start('div', array('id' => 'content'));
 }
 
 function common_show_footer() {
 	global $xw, $config;
-	common_element_start('div', 'footer');
+	common_element_end('div'); # content div
 	common_foot_menu();
-	common_license_block();
-	common_element_end('div');
-	common_element_end('div');
+	common_element_start('div', array('id' => 'footer'));
+	common_element('img', array('id' => 'cc',
+								'src' => $config['license']['image'],
+								'alt' => $config['license']['title']));
+	common_element_start('p');
+	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('p');
 	common_element_end('div');
 	common_element_end('div');
 	common_element_end('body');
@@ -196,59 +210,32 @@ function common_raw($xml) {
 	$xw->writeRaw($xml);
 }
 
-function common_license_block() {
-	global $config, $xw;
-	common_element_start('p', 'license greenBg');
-	common_element_start('span', 'floatLeft width25');
-	common_element_start('a', array('class' => 'license',
-									'rel' => 'license',
-									href => $config['license']['url']));
-	common_element('img', array('class' => 'license',
-								'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');
-}
-
-function common_head_menu() {
+function common_nav_menu() {
 	$user = common_current_user();
-	common_element_start('ul', array('id' => 'menu', 'class' => ($user) ? 'five' : 'three'));
-	common_menu_item(common_local_url('public'), _t('Public'));
+	common_element_start('ul', array('id' => 'nav'));
 	if ($user) {
-		common_menu_item(common_local_url('all', array('nickname' =>
-													   $user->nickname)),
+		common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
 						 _t('Home'));
-		common_menu_item(common_local_url('showstream', array('nickname' =>
-															  $user->nickname)),
-						 _t('Profile'),  $user->fullname || $user->nickname);
+	}
+	common_menu_item(common_local_url('public'), _t('Public'));
+	common_menu_item(common_local_url('doc', array('title' => 'help')),
+					 _t('Help'));
+	if ($user) {
 		common_menu_item(common_local_url('profilesettings'),
 						 _t('Settings'));
 		common_menu_item(common_local_url('logout'),
 						 _t('Logout'));
 	} else {
-		common_menu_item(common_local_url('login'),
-						 _t('Login'));
-		common_menu_item(common_local_url('register'),
-						 _t('Register'));
+		common_menu_item(common_local_url('login'), _t('Login'));
+		common_menu_item(common_local_url('register'), _t('Register'));
 	}
 	common_element_end('ul');
 }
 
 function common_foot_menu() {
-	common_element_start('ul', 'footmenu menuish');
+	common_element_start('ul', array('id' => 'nav_sub'));
 	common_menu_item(common_local_url('doc', array('title' => 'about')),
 					 _t('About'));
-	common_menu_item(common_local_url('doc', array('title' => 'help')),
-					 _t('Help'));
 	common_menu_item(common_local_url('doc', array('title' => 'privacy')),
 					 _t('Privacy'));
 	common_menu_item(common_local_url('doc', array('title' => 'source')),
@@ -256,12 +243,16 @@ function common_foot_menu() {
 	common_element_end('ul');
 }
 
-function common_menu_item($url, $text, $title=NULL) {
+function common_menu_item($url, $text, $title=NULL, $is_selected) {
+	$lattrs = array();
+	if ($is_selected) {
+		$lattrs['class'] = 'current';
+	}
+	common_element_start('li', $lattrs);
 	$attrs['href'] = $url;
 	if ($title) {
 		$attrs['title'] = $title;
 	}
-	common_element_start('li', 'menuitem');
 	common_element('a', $attrs, $text);
 	common_element_end('li');
 }
@@ -299,14 +290,10 @@ function common_password($id, $label) {
 function common_submit($id, $label) {
 	global $xw;
 	common_element_start('p');
-	common_element_start('label', array('for' => $id));
-	$xw->writeRaw('&nbsp;');
-	common_element_end('label');
 	common_element('input', array('type' => 'submit',
 								  'id' => $id,
 								  'name' => $id,
-								  'value' => $label,
-								  'class' => 'button'));
+								  'value' => $label));
 	common_element_end('p');
 }
 
@@ -316,8 +303,7 @@ function common_textarea($id, $label, $content=NULL) {
 	common_element('textarea', array('rows' => 3,
 									 'cols' => 40,
 									 'name' => $id,
-									 'id' => $id,
-									 'class' => 'width50'),
+									 'id' => $id),
 				   ($content) ? $content : ' ');
 	common_element_end('p');
 }
@@ -387,7 +373,7 @@ function common_current_user() {
 # get canonical version of nickname for comparison
 function common_canonical_nickname($nickname) {
 	# XXX: UTF-8 canonicalization (like combining chars)
-	return $nickname;
+	return strtolower($nickname);
 }
 
 # get canonical version of email for comparison
@@ -482,6 +468,39 @@ function common_local_url($action, $args=NULL) {
 
 function common_fancy_url($action, $args=NULL) {
 	switch (strtolower($action)) {
+	 case 'public':
+		return common_path('');
+	 case 'publicrss':
+		return common_path('rss');
+	 case 'doc':
+		return common_path('doc/'.$args['title']);
+	 case 'login':
+	 case 'logout':
+	 case 'register':
+	 case 'subscribe':
+	 case 'unsubscribe':
+		return common_path('main/'.$action);
+	 case 'avatar':
+	 case 'password':
+		return common_path('settings/'.$action);
+	 case 'profilesettings':
+		return common_path('settings/profile');
+	 case 'newnotice':
+		return common_path('notice/new');
+	 case 'shownotice':
+		return common_path('notice/'.$args['notice']);
+	 case 'subscriptions':
+	 case 'subscribed':
+	 case 'xrds':		
+	 case 'all':
+	 case 'foaf':
+		return common_path($args['nickname'].'/'.$action);
+	 case 'allrss':
+		return common_path($args['nickname'].'/all/rss');
+	 case 'userrss':
+		return common_path($args['nickname'].'/rss');
+	 case 'showstream':
+		return common_path($args['nickname']);
 	 default:
 		return common_simple_url($action, $args);
 	}
@@ -544,11 +563,25 @@ function common_profile_url($nickname) {
 	return common_local_url('showstream', array('nickname' => $nickname));
 }
 
+# Don't call if nobody's logged in
+
 function common_notice_form() {
-	common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
+	$user = common_current_user();
+	assert(!is_null($user));
+	common_element_start('form', array('id' => 'status_form',
+									   'method' => 'POST',
 									   'action' => common_local_url('newnotice')));
-	common_textarea('noticecontent', _t('What\'s up?'));
-	common_submit('submit', _t('Send'));
+	common_element_start('p');
+	common_element('label', array('for' => 'status_update',
+								  'id' => 'status_label'),
+				   _t('What\'s up, ').$user->nickname.'?');
+	common_element('textarea', array('id' => 'status_textarea',
+									 'name' => 'status_textarea'));
+	common_element('input', array('id' => 'status_submit',
+								  'name' => 'status_submit',
+								  'type' => 'submit',
+								  'value' => _t('Send')));
+	common_element_end('p');
 	common_element_end('form');
 }
 
@@ -651,3 +684,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');
+	}
+}