Browse Source

User list load a new page

Beginning of more options for administrator!
Marien Fressinaud 11 years ago
parent
commit
2796cc9ae5

+ 4 - 0
app/Controllers/userController.php

@@ -88,6 +88,10 @@ class FreshRSS_user_Controller extends Minz_ActionController {
 	 */
 	public function manageAction() {
 		Minz_View::prependTitle(_t('users.manage') . ' · ');
+
+		$this->view->current_user = Minz_Request::param(
+			'u', Minz_Session::param('currentUser', '_')
+		);
 	}
 
 	public function createAction() {

+ 1 - 1
app/views/stats/repartition.phtml

@@ -5,7 +5,7 @@
 
 	<h1><?php echo _t('stats_repartition'); ?></h1>
 
-	<select id="feed_select">
+	<select id="feed_select" class="select-change">
 		<option data-url="<?php echo _url('stats', 'repartition')?>"><?php echo _t('all_feeds')?></option>
 	<?php foreach ($this->categories as $category) {
 		$feeds = $category->feeds();

+ 20 - 21
app/views/user/manage.phtml

@@ -3,27 +3,6 @@
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
-		<legend><?php echo _t('users'); ?></legend>
-
-		<div class="form-group">
-			<label class="group-name" for="users_list"><?php echo _t('users_list'); ?></label>
-			<div class="group-controls">
-				<select id="users_list" name="username"><?php
-					foreach (listUsers() as $user) {
-						echo '<option>', $user, '</option>';
-					}
-				?></select>
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
-			</div>
-		</div>
-	</form>
-
 	<form method="post" action="<?php echo _url('user', 'create'); ?>">
 		<legend><?php echo _t('create_user'); ?></legend>
 
@@ -71,6 +50,26 @@
 				<button type="reset" class="btn"><?php echo _t('cancel'); ?></button>
 			</div>
 		</div>
+	</form>
+
+	<form method="post" action="<?php echo _url('user', 'delete'); ?>">
+		<legend><?php echo _t('users'); ?></legend>
 
+		<div class="form-group">
+			<label class="group-name" for="user-list"><?php echo _t('users_list'); ?></label>
+			<div class="group-controls">
+				<select id="user-list" class="select-change" name="username">
+					<?php foreach (listUsers() as $username) { ?>
+					<option data-url="<?php echo _url('user', 'manage', 'u', $username); ?>" <?php echo $this->current_user === $username ? 'selected="selected"' : ''; ?> value="<?php echo $username; ?>"><?php echo $username; ?></option>
+					<?php } ?>
+				</select>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-attention confirm"><?php echo _t('delete'); ?></button>
+			</div>
+		</div>
 	</form>
 </div>

+ 1 - 1
p/scripts/main.js

@@ -1086,7 +1086,7 @@ function init_share_observers() {
 }
 
 function init_stats_observers() {
-	$('#feed_select').on('change', function(e) {
+	$('.select-change').on('change', function(e) {
 		redirect($(this).find(':selected').data('url'));
 	});
 }