diff options
| -rw-r--r-- | _graphics/footer_logo.gif | bin | 0 -> 2877 bytes | |||
| -rw-r--r-- | views/default/canvas/layouts/widgets.php | 2 | ||||
| -rw-r--r-- | views/default/css.php | 64 | ||||
| -rw-r--r-- | views/default/navigation/pagination.php | 296 | ||||
| -rw-r--r-- | views/default/page_elements/footer.php | 8 |
5 files changed, 215 insertions, 155 deletions
diff --git a/_graphics/footer_logo.gif b/_graphics/footer_logo.gif Binary files differnew file mode 100644 index 000000000..4e0c95e55 --- /dev/null +++ b/_graphics/footer_logo.gif diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index a13b67679..57c46f3a4 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -72,7 +72,7 @@ <div class="customise_editpanel_instructions"> <h2>Add widgets to your page</h2> <p> -Choose the features you want to add to your page by dragging them from the <b>Widget gallery</b> to either the <b>Main content area</b> or the <b>Sidebar</b>, and position them where you would like them to appear. +Choose the features you want to add to your page by dragging them from the <b>Widget gallery</b> on the right, to any of the three widget areas below, and position them where you would like them to appear. </p> <p>To remove a widget drag it back to the <b>Widget gallery</b>. </p> diff --git a/views/default/css.php b/views/default/css.php index 593a18725..d22e8f9f3 100644 --- a/views/default/css.php +++ b/views/default/css.php @@ -86,7 +86,7 @@ a { outline: none; } a:visited { - color: #0054a7; + /* color: #0054a7; */ } a:hover { color: #0054a7; @@ -1944,7 +1944,67 @@ div.expandall p { } - + + +/* *************************************** + Pagination +*************************************** */ +.pagination { + margin:0 0 20px 0; + display: table; +} + +.pagination .pagination_number { + display:block; + float:left; + background:#ffffff; + border:1px solid #4690d6; + text-align: center; + color:#4690d6; + font-size: 12px; + font-weight: normal; + margin:0 6px 0 0; + padding:0px 4px; + cursor: pointer; +} +.pagination .pagination_number:hover, +.pagination .pagination_number:hover { + background:#4690d6; + color:white; + text-decoration: none; +} +.pagination .pagination_previous, +.pagination .pagination_next { + display:block; + float:left; + border:1px solid #4690d6; + color:#4690d6; + text-align: center; + font-size: 12px; + font-weight: normal; + margin:0 6px 0 0; + padding:0px 4px; + cursor: pointer; +} +.pagination .pagination_previous:hover, +.pagination .pagination_next:hover { + background:#4690d6; + color:white; + text-decoration: none; +} +.pagination .pagination_currentpage { + display:block; + float:left; + background:#4690d6; + border:1px solid #4690d6; + text-align: center; + color:white; + font-size: 12px; + font-weight: bold; + margin:0 6px 0 0; + padding:0px 4px; + cursor: pointer; +} diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index a4e2f16ac..bba122d5a 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -1,149 +1,149 @@ -<?php
-
- /**
- * Elgg pagination
- *
- * @package Elgg
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008
- * @link http://elgg.org/
- *
- */
-
- if (!isset($vars['offset'])) {
- $offset = 0;
- } else {
- $offset = $vars['offset'];
- }
- if (!isset($vars['limit'])) {
- $limit = 10;
- } else {
- $limit = $vars['limit'];
- }
- if (!isset($vars['count'])) {
- $count = 0;
- } else {
- $count = $vars['count'];
- }
- if (!isset($vars['word'])) {
- $word = "offset";
- } else {
- $word = $vars['word'];
- }
- if (isset($vars['nonefound'])) {
- $nonefound = $vars['nonefound'];
- } else {
- $nonefound = true;
- }
-
- $totalpages = ceil($count / $limit);
- $currentpage = ceil($offset / $limit) + 1;
-
- $baseurl = preg_replace('/[\&\?]'.$word.'\=[0-9]*/',"",$vars['baseurl']);
-
-?>
-
-<div class="pagination">
- <p>
-<?php
-
- if ($count == 0) {
-
- static $notfounddisplayed;
- if (!isset($notfounddisplayed) && $nonefound) {
- echo elgg_echo("notfound");
- $notfounddisplayed = true;
- }
-
- }
-
- if ($offset > 0) {
-
- $prevoffset = $offset - $limit;
- if ($prevoffset < 0) $prevoffset = 0;
-
- $prevurl = $baseurl;
- if (substr_count($baseurl,'?')) {
- $prevurl .= "&{$word}=" . $prevoffset;
- } else {
- $prevurl .= "?{$word}=" . $prevoffset;
- }
-
- echo "<a href=\"{$prevurl}\">« ". elgg_echo("previous") ."</a> ";
-
- }
-
- if ($offset > 0 || $offset < ($count - $limit)) {
-
- $currentpage = round($offset / $limit) + 1;
- $allpages = ceil($count / $limit);
-
- $i = 1;
- $pagesarray = array();
- while ($i <= $allpages && $i <= 4) {
- $pagesarray[] = $i;
- $i++;
- }
- $i = $currentpage - 2;
- while ($i <= $allpages && $i <= ($currentpage + 2)) {
- if ($i > 0 && !in_array($i,$pagesarray))
- $pagesarray[] = $i;
- $i++;
- }
- $i = $allpages - 3;
- while ($i <= $allpages) {
- if ($i > 0 && !in_array($i,$pagesarray))
- $pagesarray[] = $i;
- $i++;
- }
-
- sort($pagesarray);
-
- $prev = 0;
- foreach($pagesarray as $i) {
-
- if (($i - $prev) > 1) {
-
- echo " ... ";
-
- }
-
- $counturl = $baseurl;
- $curoffset = (($i - 1) * $limit);
- if (substr_count($baseurl,'?')) {
- $counturl .= "&{$word}=" . $curoffset;
- } else {
- $counturl .= "?{$word}=" . $curoffset;
- }
- if ($curoffset != $offset) {
- echo " <a href=\"{$counturl}\">{$i}</a> ";
- } else {
- echo " {$i} ";
- }
- $prev = $i;
-
- }
-
- }
-
- if ($offset < ($count - $limit)) {
-
- $nextoffset = $offset + $limit;
- if ($nextoffset >= $count) $nextoffset--;
-
- $nexturl = $baseurl;
- if (substr_count($baseurl,'?')) {
- $nexturl .= "&{$word}=" . $nextoffset;
- } else {
- $nexturl .= "?{$word}=" . $nextoffset;
- }
-
- echo " <a href=\"{$nexturl}\">" . elgg_echo("next") . " »</a>";
-
- }
-
-?>
- </p>
+<?php + + /** + * Elgg pagination + * + * @package Elgg + * @subpackage Core + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider Ltd + * @copyright Curverider Ltd 2008 + * @link http://elgg.org/ + * + */ + + if (!isset($vars['offset'])) { + $offset = 0; + } else { + $offset = $vars['offset']; + } + if (!isset($vars['limit'])) { + $limit = 10; + } else { + $limit = $vars['limit']; + } + if (!isset($vars['count'])) { + $count = 0; + } else { + $count = $vars['count']; + } + if (!isset($vars['word'])) { + $word = "offset"; + } else { + $word = $vars['word']; + } + if (isset($vars['nonefound'])) { + $nonefound = $vars['nonefound']; + } else { + $nonefound = true; + } + + $totalpages = ceil($count / $limit); + $currentpage = ceil($offset / $limit) + 1; + + $baseurl = preg_replace('/[\&\?]'.$word.'\=[0-9]*/',"",$vars['baseurl']); + +?> + +<div class="pagination"> + <p> +<?php + + if ($count == 0) { + + static $notfounddisplayed; + if (!isset($notfounddisplayed) && $nonefound) { + echo elgg_echo("notfound"); + $notfounddisplayed = true; + } + + } + + if ($offset > 0) { + + $prevoffset = $offset - $limit; + if ($prevoffset < 0) $prevoffset = 0; + + $prevurl = $baseurl; + if (substr_count($baseurl,'?')) { + $prevurl .= "&{$word}=" . $prevoffset; + } else { + $prevurl .= "?{$word}=" . $prevoffset; + } + + echo "<a href=\"{$prevurl}\" class=\"pagination_previous\">« ". elgg_echo("previous") ."</a> "; + + } + + if ($offset > 0 || $offset < ($count - $limit)) { + + $currentpage = round($offset / $limit) + 1; + $allpages = ceil($count / $limit); + + $i = 1; + $pagesarray = array(); + while ($i <= $allpages && $i <= 4) { + $pagesarray[] = $i; + $i++; + } + $i = $currentpage - 2; + while ($i <= $allpages && $i <= ($currentpage + 2)) { + if ($i > 0 && !in_array($i,$pagesarray)) + $pagesarray[] = $i; + $i++; + } + $i = $allpages - 3; + while ($i <= $allpages) { + if ($i > 0 && !in_array($i,$pagesarray)) + $pagesarray[] = $i; + $i++; + } + + sort($pagesarray); + + $prev = 0; + foreach($pagesarray as $i) { + + if (($i - $prev) > 1) { + + echo " ... "; + + } + + $counturl = $baseurl; + $curoffset = (($i - 1) * $limit); + if (substr_count($baseurl,'?')) { + $counturl .= "&{$word}=" . $curoffset; + } else { + $counturl .= "?{$word}=" . $curoffset; + } + if ($curoffset != $offset) { + echo " <a href=\"{$counturl}\" class=\"pagination_number\">{$i}</a> "; + } else { + echo "<span class=\"pagination_currentpage\"> {$i} </span>"; + } + $prev = $i; + + } + + } + + if ($offset < ($count - $limit)) { + + $nextoffset = $offset + $limit; + if ($nextoffset >= $count) $nextoffset--; + + $nexturl = $baseurl; + if (substr_count($baseurl,'?')) { + $nexturl .= "&{$word}=" . $nextoffset; + } else { + $nexturl .= "?{$word}=" . $nextoffset; + } + + echo " <a href=\"{$nexturl}\" class=\"pagination_next\">" . elgg_echo("next") . " »</a>"; + + } + +?> + </p> </div>
\ No newline at end of file diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php index 48019cdfd..a2e01b932 100644 --- a/views/default/page_elements/footer.php +++ b/views/default/page_elements/footer.php @@ -24,9 +24,9 @@ <table width="958" height="79" border="1" cellpadding="0" cellspacing="0"> <tr> <td width="310" height="50"> - <p><a href="http://www.elgg.org" target="_blank"> - Powered by Elgg - </a></p> + <a href="http://www.elgg.org" target="_blank"> + <img src="<?php echo $vars['url']; ?>_graphics/footer_logo.gif" border="0" /> + </a> </td> <td width="648" height="50" align="right"> @@ -45,7 +45,7 @@ <tr> <td width="310" height="28"> - <p></p> + <p><small><a href="http://www.elgg.org" target="_blank">Powered by Elgg</a></small></p> </td> <td width="648" height="28" align="right"> |
