Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 35 insertions, 0 deletions

diff --git a/data/templates/default/admin.tpl.php b/data/templates/default/admin.tpl.php
new file mode 100644
index 0000000..50680f6
--- /dev/null
+++ b/data/templates/default/admin.tpl.php
@@ -0,0 +1,35 @@
+<?php

+

+$this->includeTemplate($GLOBALS['top_include']);
+
+echo '<h3>'.T_('Users management').'</h3>';
+

+echo '<ol id="bookmarks">';

+
+foreach($users as $user) {

+	echo '<li class="xfolkentry">'."\n";

+

+	echo '<div class="link">';

+	echo '<a href="'.createURL('profile', $user->getUsername()).'">'.$user->getUsername().'</a>';
+	echo ' - <span title="'. T_('Public/Shared/Private') .'">'. $user->getNbBookmarks('public') .' / '. $user->getNbBookmarks('shared') .' / '. $user->getNbBookmarks('private') .' '. T_('bookmark(s)') .'</span>';

+	echo '</div>';

+
+	if($user->getUsername() != $currentUser->getUsername()) {

+	    echo '<div class="meta">';

+	    echo '<a href="'.createURL('admin','delete/'.$user->getUsername()).'" onclick="return confirm(\''.T_('Are you sure?').'\');">'.T_('Delete').'</a>';

+	    echo '</div>';
+	}

+

+	echo '</li>'."\n";

+}
+echo '</ol>';
+?>
+<h3><?php echo T_('Other actions')?></h3>
+<p>
+<a href="<?php echo createURL('admin','checkUrl/') ?>"> <?php echo T_('Check all URLs (May take some time)')  ?></a>
+</p>
+<?php

+$this->includeTemplate('sidebar.tpl');

+$this->includeTemplate($GLOBALS['bottom_include']);

+

+?>