Browse Source

move containers inside the main_content block

main
ghost 1 year ago
parent
commit
fbeb793f6d
  1. 152
      templates/default/user/info.html.twig
  2. 202
      templates/default/user/profile.html.twig

152
templates/default/user/info.html.twig

@ -1,88 +1,90 @@
{% extends 'default/layout.html.twig' %} {% extends 'default/layout.html.twig' %}
{% block title %}{{ 'User'|trans }} #{{ user.id }} - {{ name }}{% endblock %} {% block title %}{{ 'User'|trans }} #{{ user.id }} - {{ name }}{% endblock %}
{% block main_content %} {% block main_content %}
<div class="text-center"> <div class="padding-24-px margin-y-8-px border-radius-3-px background-color-night">
<img class="border-radius-50 border-default border-width-2-px" src="{{ user.identicon }}" alt="{{ 'identicon'|trans }}" /> <div class="text-center">
</div> <img class="border-radius-50 border-default border-width-2-px" src="{{ user.identicon }}" alt="{{ 'identicon'|trans }}" />
<h2>{{ 'Profile'|trans }}</h2> </div>
<table class="width-100"> <h2>{{ 'Profile'|trans }}</h2>
<tbody> <table class="width-100">
<tr> <tbody>
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Common'|trans }}</td>
</tr>
{% if user.address %}
<tr> <tr>
<td class="padding-t-16-px">{{ 'Address'|trans }}</td> <td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Common'|trans }}</td>
<td class="padding-t-16-px"> </tr>
{{ user.address }} {% if user.address %}
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16"> <tr>
<path d="M11 1a2 2 0 0 0-2 2v4a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h5V3a3 3 0 0 1 6 0v4a.5.5 0 0 1-1 0V3a2 2 0 0 0-2-2zM3 8a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1H3z"/> <td class="padding-t-16-px">{{ 'Address'|trans }}</td>
</svg> <td class="padding-t-16-px">
<span class="opacity-0 parent-hover-opacity-09" title="{{ 'Address hidden for others'|trans }}"> {{ user.address }}
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/> <path d="M11 1a2 2 0 0 0-2 2v4a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h5V3a3 3 0 0 1 6 0v4a.5.5 0 0 1-1 0V3a2 2 0 0 0-2-2zM3 8a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1H3z"/>
</svg> </svg>
</span> <span class="opacity-0 parent-hover-opacity-09" title="{{ 'Address hidden for others'|trans }}">
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</svg>
</span>
</td>
</tr>
<tr>
<td>{{ 'Joined'|trans }}</td>
<td>{{ user.added }}</td>
</tr>
{% else %}
<tr>
<td class="padding-t-16-px">{{ 'Joined'|trans }}</td>
<td class="padding-t-16-px">{{ user.added }}</td>
</tr>
{% endif %}
<tr>
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Access'|trans }}</td>
</tr>
<tr>
<td class="padding-t-16-px">{{ 'Status'|trans }}</td>
<td class="padding-t-16-px">
{% if user.status %}
{{ 'active'|trans }}
{% else %}
{{ 'disabled'|trans }}
{% endif %}
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{{ 'Joined'|trans }}</td> <td>{{ 'Approved'|trans }}</td>
<td>{{ user.added }}</td> <td>
{% if user.approved %}
{{ 'yes'|trans }}
{% else %}
{{ 'no'|trans }}
{% endif %}
</td>
</tr> </tr>
{% else %}
<tr> <tr>
<td class="padding-t-16-px">{{ 'Joined'|trans }}</td> <td>{{ 'Moderator'|trans }}</td>
<td class="padding-t-16-px">{{ user.added }}</td> <td>
{% if user.moderator %}
{{ 'yes'|trans }}
{% else %}
{{ 'no'|trans }}
{% endif %}
</td>
</tr> </tr>
{% endif %} <tr>
<tr> <td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Settings'|trans }}</td>
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Access'|trans }}</td> </tr>
</tr> <tr>
<tr> <td class="padding-t-16-px">{{ 'Interface'|trans }}</td>
<td class="padding-t-16-px">{{ 'Status'|trans }}</td> <td class="padding-t-16-px">
<td class="padding-t-16-px"> {{ user.locale|locale_name(user.locale)|u.title }}
{% if user.status %} </td>
{{ 'active'|trans }} </tr>
{% else %} <tr>
{{ 'disabled'|trans }} <td>{{ 'Content filter'|trans }}</td>
{% endif %} <td>
</td> {% for i, locale in user.locales %}{% if i > 0 %},{% endif %} {{ locale|locale_name(locale)|u.title }}{% endfor %}
</tr> </td>
<tr> </tr>
<td>{{ 'Approved'|trans }}</td> </tbody>
<td> </table>
{% if user.approved %} </div>
{{ 'yes'|trans }}
{% else %}
{{ 'no'|trans }}
{% endif %}
</td>
</tr>
<tr>
<td>{{ 'Moderator'|trans }}</td>
<td>
{% if user.moderator %}
{{ 'yes'|trans }}
{% else %}
{{ 'no'|trans }}
{% endif %}
</td>
</tr>
<tr>
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Settings'|trans }}</td>
</tr>
<tr>
<td class="padding-t-16-px">{{ 'Interface'|trans }}</td>
<td class="padding-t-16-px">
{{ user.locale|locale_name(user.locale)|u.title }}
</td>
</tr>
<tr>
<td>{{ 'Content filter'|trans }}</td>
<td>
{% for i, locale in user.locales %}{% if i > 0 %},{% endif %} {{ locale|locale_name(locale)|u.title }}{% endfor %}
</td>
</tr>
</tbody>
</table>
{% endblock %} {% endblock %}

202
templates/default/user/profile.html.twig

@ -1,109 +1,111 @@
{% extends 'default/layout.html.twig' %} {% extends 'default/layout.html.twig' %}
{% block title %}{{ 'Profile'|trans }} - {{ name }}{% endblock %} {% block title %}{{ 'Profile'|trans }} - {{ name }}{% endblock %}
{% block main_content %} {% block main_content %}
<form name="profile" action="{{ path('user_profile') }}" method="post"> <div class="padding-24-px margin-y-8-px border-radius-3-px background-color-night">
<div class="text-center"> <form name="profile" action="{{ path('user_profile') }}" method="post">
<img class="border-radius-50 border-default border-width-2-px" src="{{ user.identicon }}" alt="{{ 'identicon'|trans }}" /> <div class="text-center">
</div> <img class="border-radius-50 border-default border-width-2-px" src="{{ user.identicon }}" alt="{{ 'identicon'|trans }}" />
<h2>{{ 'Profile'|trans }}</h2> </div>
<table class="width-100"> <h2>{{ 'Profile'|trans }}</h2>
<tbody> <table class="width-100">
<tr> <tbody>
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Common'|trans }}</td> <tr>
</tr> <td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Common'|trans }}</td>
<tr> </tr>
<td class="padding-t-16-px">{{ 'Address'|trans }}</td> <tr>
<td class="padding-t-16-px"> <td class="padding-t-16-px">{{ 'Address'|trans }}</td>
{{ user.address }} <td class="padding-t-16-px">
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16"> {{ user.address }}
<path d="M11 1a2 2 0 0 0-2 2v4a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h5V3a3 3 0 0 1 6 0v4a.5.5 0 0 1-1 0V3a2 2 0 0 0-2-2zM3 8a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1H3z"/>
</svg>
<span class="opacity-0 parent-hover-opacity-09" title="{{ 'Address hidden for others'|trans }}">
<svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16"> <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/> <path d="M11 1a2 2 0 0 0-2 2v4a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V9a2 2 0 0 1 2-2h5V3a3 3 0 0 1 6 0v4a.5.5 0 0 1-1 0V3a2 2 0 0 0-2-2zM3 8a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1h6a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1H3z"/>
</svg> </svg>
</span> <span class="opacity-0 parent-hover-opacity-09" title="{{ 'Address hidden for others'|trans }}">
</td> <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" viewBox="0 0 16 16">
</tr> <path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
<tr> </svg>
<td>{{ 'Joined'|trans }}</td> </span>
<td>{{ user.added }}</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Access'|trans }}</td> <td>{{ 'Joined'|trans }}</td>
</tr> <td>{{ user.added }}</td>
<tr> </tr>
<td class="padding-t-16-px">{{ 'Status'|trans }}</td> <tr>
<td class="padding-t-16-px"> <td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Access'|trans }}</td>
{% if user.status %} </tr>
{{ 'active'|trans }} <tr>
{% else %} <td class="padding-t-16-px">{{ 'Status'|trans }}</td>
{{ 'disabled'|trans }} <td class="padding-t-16-px">
{% endif %} {% if user.status %}
</td> {{ 'active'|trans }}
</tr> {% else %}
<tr> {{ 'disabled'|trans }}
<td>{{ 'Approved'|trans }}</td> {% endif %}
<td> </td>
{% if user.approved %} </tr>
{{ 'yes'|trans }} <tr>
{% else %} <td>{{ 'Approved'|trans }}</td>
{{ 'no'|trans }} <td>
{% endif %} {% if user.approved %}
</td> {{ 'yes'|trans }}
</tr> {% else %}
<tr> {{ 'no'|trans }}
<td>{{ 'Moderator'|trans }}</td> {% endif %}
<td> </td>
{% if user.moderator %} </tr>
{{ 'yes'|trans }} <tr>
{% else %} <td>{{ 'Moderator'|trans }}</td>
{{ 'no'|trans }} <td>
{% endif %} {% if user.moderator %}
</td> {{ 'yes'|trans }}
</tr> {% else %}
<tr> {{ 'no'|trans }}
<td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Settings'|trans }}</td> {% endif %}
</tr> </td>
<tr> </tr>
<td class="padding-t-16-px">{{ 'Interface'|trans }}</td> <tr>
<td class="padding-t-16-px"> <td class="padding-b-8-px border-bottom-default text-right" colspan="2">{{ 'Settings'|trans }}</td>
<select name="locale"> </tr>
<tr>
<td class="padding-t-16-px">{{ 'Interface'|trans }}</td>
<td class="padding-t-16-px">
<select name="locale">
{% for locale in locales %}
{% if locale == user.locale %}
<option value="{{ locale }}" selected="selected">
{{ locale|locale_name(locale)|u.title }}
</option>
{% else %}
<option value="{{ locale }}">
{{ locale|locale_name(locale)|u.title }}
</option>
{% endif %}
{% endfor %}
</select>
</td>
</tr>
<tr>
<td>{{ 'Content filter'|trans }}</td>
<td>
{% for locale in locales %} {% for locale in locales %}
{% if locale == user.locale %} <div class="padding-y-4-px">
<option value="{{ locale }}" selected="selected"> {% if locale in user.locales %}
<input name="locales[]" id="{{ locale }}" type="checkbox" value="{{ locale }}" checked="checked" />
{% else %}
<input name="locales[]" id="{{ locale }}" type="checkbox" value="{{ locale }}" />
{% endif %}
<label for="{{ locale }}">
{{ locale|locale_name(locale)|u.title }} {{ locale|locale_name(locale)|u.title }}
</option> </label>
{% else %} </div>
<option value="{{ locale }}">
{{ locale|locale_name(locale)|u.title }}
</option>
{% endif %}
{% endfor %} {% endfor %}
</select> </td>
</td> </tr>
</tr> </tbody>
<tr> </table>
<td>{{ 'Content filter'|trans }}</td> <div class="text-right">
<td> <input class="button-green" type="submit" value="{{'Save'|trans }}" />
{% for locale in locales %} </div>
<div class="padding-y-4-px"> </form>
{% if locale in user.locales %} </div>
<input name="locales[]" id="{{ locale }}" type="checkbox" value="{{ locale }}" checked="checked" />
{% else %}
<input name="locales[]" id="{{ locale }}" type="checkbox" value="{{ locale }}" />
{% endif %}
<label for="{{ locale }}">
{{ locale|locale_name(locale)|u.title }}
</label>
</div>
{% endfor %}
</td>
</tr>
</tbody>
</table>
<div class="text-right">
<input class="button-green" type="submit" value="{{'Save'|trans }}" />
</div>
</form>
{% endblock %} {% endblock %}
Loading…
Cancel
Save