Merge. Remove admin links from sidebar. They are in the footer now

Merge branch 'master' of disposed.de:scattport

Conflicts:
	application/views/header.php

application/views/admin/users/index.php

@@ -3,7 +3,7 @@
 <div id="content">
 
 	<div class="title">
-		<h2><?=lang('users');?></h2>
+		<h2><?=_('users');?></h2>
 	</div>
 
 	<div class="box">
@@ -17,15 +17,15 @@
 				</tr>
 			</thead>
 <?php
-foreach ($users as $user):
+	foreach ($users as $user):
 ?>
 				<tr>
 					<td><?=$user['username'];?></td>
 					<td><?=$user['firstname'];?> <?=$user['lastname'];?></td>
-					<td><?=anchor('users/edit/' . $user['id'], lang('user_edit'));?> | <?=anchor('users/delete/' . $user['id'], lang('user_delete'));?></td>
+					<td><?=anchor('users/edit/' . $user['id'], lang('user_edit'));?> | <a href="javascript:deleteConfirm('<?=site_url('users/delete/' . $user['id']);?>');"><?=lang('user_delete');?></a></td>
 				</tr>
 <?php
-endforeach;
+	endforeach;
 ?>
 			<tbody>
 			</tbody>

application/views/header.php

@@ -59,17 +59,6 @@
 						<li><a href="<?=site_url('projects/create')?>" title="Neues Projekt anlegen">Neues Projekt</a></li>
 					</ul>
 				</li>
-<?
-	if($this->session->userdata('group') == 'admins'):
-?>
-				<li>Administration
-					<ul>
-						<li><a href="<?=site_url('admin/servers')?>" title="Berechnungsserver verwalten">Berechnungsserver</a></li>
-					</ul>
-				</li>
-<?
-	endif;
-?>
 			</ul>
 		</div>