Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 33 insertions, 0 deletions

diff --git a/data/templates/default/users.tpl.php b/data/templates/default/users.tpl.php
new file mode 100644
index 0000000..fa92bef
--- /dev/null
+++ b/data/templates/default/users.tpl.php
@@ -0,0 +1,33 @@
+<?php
+$this->includeTemplate($GLOBALS['top_include']);
+
+if ($users && count($users) > 0) {
+?>
+
+<!--p id="sort">
+    <?php echo T_("Sort by:"); ?>
+    <a href="?sort=alphabet_asc"><?php echo T_("Alphabet"); ?></a><span> / </span>
+    <a href="?sort=popularity_asc"><?php echo T_("Popularity"); ?></a>
+</p-->
+<p class="users">
+<ul>
+<?php
+$contents = '<';
+foreach ($users as $row) {
+    echo  '<li><strong>'
+        . SemanticScuttle_Model_UserArray::getName($row) . '</strong>'
+        . ' (<a href="' . createURL('profile', $row['username']) . '">'
+        . T_('profile') . '</a> '
+        . T_('created in') . ' '
+        . date('M Y', strtotime($row['uDatetime'])) . ')'
+        . ' : <a href="' . createURL('bookmarks', $row['username']).'">'
+        . T_('bookmarks') . '</a></li>';
+}
+?>
+</ul>
+</p>
+
+<?php
+}
+$this->includeTemplate($GLOBALS['bottom_include']);
+?>