aboutsummaryrefslogtreecommitdiff
path: root/views/default/navigation
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
commit4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch)
tree969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /views/default/navigation
parent57a217fd6b708844407486046a1faa23b46cac08 (diff)
downloadelgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz
elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/navigation')
-rwxr-xr-xviews/default/navigation/main_nav.php65
-rw-r--r--views/default/navigation/pagination.php21
-rw-r--r--views/default/navigation/topbar_tools.php8
3 files changed, 79 insertions, 15 deletions
diff --git a/views/default/navigation/main_nav.php b/views/default/navigation/main_nav.php
new file mode 100755
index 000000000..42796ef9a
--- /dev/null
+++ b/views/default/navigation/main_nav.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Main navigation bar
+ **/
+
+echo "<div id='elgg_main_nav' class='clearfloat'>";
+echo "<ul class='navigation'>";
+//if(get_context() == 'home')
+// $selected = "class=selected";
+//else
+// $selected = "";
+//echo "<li {$selected}><a href=\"{$vars['url']}\" id='home'><span>Home</span></a></li>";
+if(is_plugin_enabled('riverdashboard')){
+ if(get_context() == 'riverdashboard')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}mod/riverdashboard/\" id='activity'><span>Activity</span></a></li>";
+}
+if(is_plugin_enabled('thewire') && isloggedin()){
+ if(get_context() == 'thewire')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}mod/thewire/all.php\" id='thewire'><span>" . elgg_echo('thewire') . "</span></a></li>";
+}
+if(is_plugin_enabled('blog')){
+ if(get_context() == 'blog')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}mod/blog/all.php\" id='blogs'><span>Blogs</span></a></li>";
+}
+if(is_plugin_enabled('pages')){
+ if(get_context() == 'pages')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}mod/pages/all.php\" id='pages'><span>Pages</span></a></li>";
+}
+if(is_plugin_enabled('file')){
+ if(get_context() == 'file')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}mod/file/all.php\" id='files'><span>Files</span></a></li>";
+}
+if(is_plugin_enabled('bookmarks')){
+ if(get_context() == 'bookmarks')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}mod/bookmarks/all.php\" id='bookmarks'><span>Bookmarks</span></a></li>";
+}
+if(is_plugin_enabled('groups')){
+ if(get_context() == 'groups')
+ $selected = 'class="selected"';
+ else
+ $selected = "";
+ echo "<li {$selected}><a href=\"{$vars['url']}pg/groups/all/\" id='groups'><span>". elgg_echo('groups') . "</span></a></li>";
+}
+echo "</ul>";
+echo "</div>";
+
+?> \ No newline at end of file
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 11dfd0e86..9dde51eea 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -38,12 +38,14 @@ if (isset($vars['nonefound'])) {
$totalpages = ceil($count / $limit);
$currentpage = ceil($offset / $limit) + 1;
+//$baseurl = elgg_http_remove_url_query_element($vars['baseurl'], $word);
+
//only display if there is content to paginate through or if we already have an offset
if (($count > $limit || $offset > 0) && get_context() != 'widget') {
?>
- <div class="pagination">
+ <div class="pagination clearfloat">
<?php
if ($offset > 0) {
@@ -53,9 +55,9 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
$prevoffset = 0;
}
- $prevurl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $prevoffset));
+ $prevurl = elgg_http_add_url_query_elements($baseurl, array($word => $prevoffset));
- echo "<a href=\"{$prevurl}\" class=\"pagination_previous\">&laquo; ". elgg_echo("previous") ."</a> ";
+ echo "<a href=\"{$prevurl}\" class='pagination_previous'>&laquo; ". elgg_echo("previous") ."</a> ";
}
if ($offset > 0 || $offset < ($count - $limit)) {
@@ -89,16 +91,16 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
$prev = 0;
foreach($pagesarray as $i) {
if (($i - $prev) > 1) {
- echo "<span class=\"pagination_more\">...</span>";
+ echo "<span class='pagination_more'>...</span>";
}
$curoffset = (($i - 1) * $limit);
- $counturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $curoffset));
+ $counturl = elgg_http_add_url_query_elements($base_url, array($word => $curoffset));
if ($curoffset != $offset) {
- echo " <a href=\"{$counturl}\" class=\"pagination_number\">{$i}</a> ";
+ echo " <a href=\"{$counturl}\" class='pagination_number'>{$i}</a> ";
} else {
- echo "<span class=\"pagination_currentpage\"> {$i} </span>";
+ echo "<span class='pagination_currentpage'> {$i} </span>";
}
$prev = $i;
@@ -112,14 +114,13 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
$nextoffset--;
}
- $nexturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $nextoffset));
+ $nexturl = elgg_http_add_url_query_elements($baseurl, array($word => $nextoffset));
- echo " <a href=\"{$nexturl}\" class=\"pagination_next\">" . elgg_echo("next") . " &raquo;</a>";
+ echo " <a href=\"{$nexturl}\" class='pagination_next'>" . elgg_echo("next") . " &raquo;</a>";
}
?>
- <div class="clearfloat"></div>
</div>
<?php
} // end of pagination check if statement \ No newline at end of file
diff --git a/views/default/navigation/topbar_tools.php b/views/default/navigation/topbar_tools.php
index 897a827d6..0e0eec097 100644
--- a/views/default/navigation/topbar_tools.php
+++ b/views/default/navigation/topbar_tools.php
@@ -12,8 +12,6 @@
$menu = get_register('menu');
-//var_export($menu);
-
if (is_array($menu) && sizeof($menu) > 0) {
$alphamenu = array();
foreach($menu as $item) {
@@ -23,8 +21,8 @@ if (is_array($menu) && sizeof($menu) > 0) {
?>
-<ul class="topbardropdownmenu">
- <li class="drop"><a href="#" class="menuitemtools"><?php echo(elgg_echo('tools')); ?></a>
+<ul class="tools_menu">
+ <li class="menu"><a href="#" class="tools"><?php echo(elgg_echo('tools')); ?></a>
<ul>
<?php
foreach($alphamenu as $item) {
@@ -37,7 +35,7 @@ if (is_array($menu) && sizeof($menu) > 0) {
<script type="text/javascript">
$(function() {
- $('ul.topbardropdownmenu').elgg_topbardropdownmenu();
+ $('ul.tools_menu').elgg_dropdownmenu();
});
</script>