Add edit and create user functionality, add link to current user

This commit is contained in:
Matias Griese
2014-10-10 15:04:12 +03:00
parent fcdf348aa1
commit fc16e20f59
5 changed files with 53 additions and 7 deletions

View File

@@ -273,6 +273,11 @@ class Admin
$obj->merge($post); $obj->merge($post);
$obj->file($file); $obj->file($file);
$data[$type] = $obj;
} elseif (preg_match('|users/|', $type)) {
$obj = User::load(preg_replace('|users/|', '', $type));
$obj->merge($post);
$data[$type] = $obj; $data[$type] = $obj;
} else { } else {
throw new \RuntimeException("Data type '{$type}' doesn't exist!"); throw new \RuntimeException("Data type '{$type}' doesn't exist!");

View File

@@ -7,7 +7,7 @@
<div id="admin-user-details"> <div id="admin-user-details">
<img src="http://www.gravatar.com/avatar/{{ admin.user.email|md5 }}?s=32" /> <img src="http://www.gravatar.com/avatar/{{ admin.user.email|md5 }}?s=32" />
<div class="admin-user-names"> <div class="admin-user-names">
<h4>{{ admin.user.fullname }}</h4> <h4><a href="{{ base_url_relative }}/users/{{ admin.user.username }}">{{ admin.user.fullname }}</a></h4>
<h5>{{ admin.user.title }}</h5> <h5>{{ admin.user.title }}</h5>
</div> </div>
</div> </div>

View File

@@ -0,0 +1,17 @@
{% if user.exists %}
<div class="user-details">
<img src="http://www.gravatar.com/avatar/{{ user.email|md5 }}?s=64" />
<h1>{{ user.fullname }}{% if user.title %} <small>({{ user.title }})</small>{% endif %}</h1>
</div>
{% else %}
<h1>Create new user</h1>
{% endif %}
{% include 'partials/blueprints.html.twig' with { data: user, blueprints: user.blueprints } %}
{% if user.exists and admin.user.username != user.username %}
<div class="button-bar danger">
<span class="danger-zone"></span>
<a class="button" href="#"><i class="fa fa-fw fa-warning"></i>Remove User</a>
</div>
{% endif %}

View File

@@ -0,0 +1,6 @@
<div class="users card-row grid fixed-blocks pure-g">
{% for user in admin.users %}
<div class="theme card-item pure-u-1-3">
</div>
{% endfor %}
</div>

View File

@@ -1,14 +1,32 @@
{% extends 'partials/base.html.twig' %} {% extends 'partials/base.html.twig' %}
{% if admin.route %}
{% set user = admin.data('users/' ~ admin.route) %}
{% endif %}
{% block titlebar %}
{% if not admin.route %}
<div class="button-bar">
<button class="button" type="submit" name="task" value="add"><i class="fa fa-plus"></i> Add</button>
</div>
<h1><i class="fa fa-fw fa-child"></i> Users</h1>
{% else %}
<div class="button-bar">
<button class="button" type="submit" name="task" value="save" form="blueprints"><i class="fa fa-check"></i> Save</button>
</div>
<h1><i class="fa fa-fw fa-user"></i> User: {{ user.username|e }}</h1>
{% endif %}
{% endblock %}
{% block content %} {% block content %}
<div>
<div class="admin-block">
<h1>
Users
</h1>
{% include 'partials/messages.html.twig' %} {% include 'partials/messages.html.twig' %}
{% if not admin.route %}
{% include 'partials/users-list.html.twig' %}
{% else %}
{% include 'partials/users-details.html.twig' %}
{% endif %}
</div> </div>
{% endblock %} {% endblock %}