summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatar buckaroo-labs2023-12-20 22:45:52 -0800
committerGravatar buckaroo-labs2023-12-20 22:45:52 -0800
commitd2a385d88dd012e3f265faeb4a6def95bcae29cb (patch)
treeaed1115349ae16b0128830a5a8a386b5e54ffc26
parent8ed4ea495a74628a5da6064d4a75c48d5bb132b8 (diff)
parentcf4701a7507c7ddb547e7080669906b4ffe80a83 (diff)
downloadscuttle-d2a385d88dd012e3f265faeb4a6def95bcae29cb.tar.gz
scuttle-d2a385d88dd012e3f265faeb4a6def95bcae29cb.zip
Merge branch 'master' of https://github.com/buckaroo-labs/semantic-scuttle
-rw-r--r--data/templates/minimal/about.tpl.php2
-rw-r--r--data/templates/minimal/toolbar.inc.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/data/templates/minimal/about.tpl.php b/data/templates/minimal/about.tpl.php
index 40d269b..bd08802 100644
--- a/data/templates/minimal/about.tpl.php
+++ b/data/templates/minimal/about.tpl.php
@@ -6,7 +6,7 @@ $this->includeTemplate($GLOBALS['top_include']);
<div class="row">
<ul>
- <li><a target="_blank" href="http://sourceforge.net/projects/semanticscuttle/">Semantic Scuttle</a> <?php echo T_('is licensed under the ');?> <a target="_blank"href="http://www.gnu.org/copyleft/gpl.html"><acronym title="GNU\'s Not Unix">GNU</acronym> General Public License</a> (<?php echo T_('you can freely host it on your own web server'); ?>)
+ <li><a target="_blank" href="https://github.com/buckaroo-labs/semantic-scuttle">Semantic Scuttle</a> <?php echo T_('is licensed under the ');?> <a target="_blank"href="http://www.gnu.org/copyleft/gpl.html"><acronym title="GNU\'s Not Unix">GNU</acronym> General Public License</a> (<?php echo T_('you can freely host it on your own web server'); ?>)
<?php echo sprintf(T_(' and supports most of the <a target="_blank" href="http://www.delicious.com/help/api">del.icio.us <abbr title="Application Programming Interface">API</abbr></a>. '), $GLOBALS['sitename']); ?></li>
<li><a target="_blank" href="https://github.com/jonrandoem/sscuttlizr/">Sscuttlizr</a> <?php echo T_('is licensed under the ');?> <a target="_blank" href="https://github.com/jonrandoem/sscuttlizr/blob/master/LICENSE">MIT License</a>
diff --git a/data/templates/minimal/toolbar.inc.php b/data/templates/minimal/toolbar.inc.php
index 0237553..f13e16c 100644
--- a/data/templates/minimal/toolbar.inc.php
+++ b/data/templates/minimal/toolbar.inc.php
@@ -6,11 +6,11 @@ if ($userservice->isLoggedOn() && is_object($currentUser)) {
<ul class="nav navbar-nav navigation">
<li><a href="<?php echo createURL(''); ?>"><i class="fa fa-home"></i> <?php echo T_('All'); ?></a></li>
- <li><a href="<?php echo createURL('bookmarks', $cUsername); ?>"><i class="fa fa-star"></i> <?php echo T_('Bookmarks'); ?></a></li>
+ <li><a href="<?php echo createURL('bookmarks', $cUsername); ?>"><i class="fa fa-star"></i> <?php echo T_('Mine'); ?></a></li>
<li><a href="<?php echo createURL('alltags', $cUsername); ?>"><i class="fa fa-tags"></i> <?php echo T_('Tags'); ?></a></li>
<li><a href="<?php echo createURL('watchlist', $cUsername); ?>"><i class="fa fa-users"></i> <?php echo T_('Watchlist'); ?></a></li>
<li><a href="<?php echo $userservice->getProfileUrl($cUserId, $cUsername); ?>"><i class="fa fa-user"></i> <?php echo T_('Profile'); ?></a></li>
- <li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><i class="fa fa-bookmark"></i> <?php echo T_('Add a Bookmark'); ?></a></li>
+ <li><a href="<?php echo createURL('bookmarks', $cUsername . '?action=add'); ?>"><i class="fa fa-bookmark"></i> <?php echo T_('Add'); ?></a></li>
<li><a href="<?php echo createURL('about'); ?>"><i class="fa fa-info-circle"></i> <?php echo T_('About'); ?></a></li>
</ul>
<ul class="nav navbar-nav navbar-right navigation">