pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

Merge branch '28-update-bootstrap' into dev

Browse source
This commit is contained in:
Henrik Hautakoski 2022-08-07 13:24:26 +02:00
commit 638d318a17
42 changed files with 343 additions and 2653 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/views/_common/_components/flash.volt
View file

@ -10,12 +10,9 @@
{% for type, messages in flash.getMessages() %}
{% for message in messages %}
<div class="alert alert-{{ types[type] }} alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<strong>{{ type|capitalize }}</strong>
<p>
{{ message }}
</p>
<h5 class="alert-heading">{{ type|capitalize }}</h5>
<p class="mb-0">{{ message }}</p>
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close">
</div>
{% endfor%}
{% endfor %}

6
app/views/_common/_components/navigation.volt
View file

@ -9,15 +9,15 @@
{% if auth.hasIdentity() %}
<div class="navigation-user-menu-dropdown">
<a id="user-dropdown-button" class="navigation-user-menu-dropdown-button"
data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
data-bs-toggle="dropdown" role="button" aria-expanded="false">
{{ icon('solid/user') }} <strong>{{ auth.getUser().username }}</strong>
</a>
<ul aria-labelledby="user-dropdown" class="navigation-user-menu-dropdown-list">
<ul class="dropdown-menu navigation-user-menu-dropdown-list">
<li>{{ link_to(['for': 'user-settings'], '<i class="icon fas fa-cog"></i> Settings') }}</li>
<li>{{ link_to('/user/activity', '<i class="icon fas fa-list-alt"></i> Activity') }}</li>
<li role="separator" class="divider"></li>
<li><hr class="dropdown-divider"></li>
<li>{{ link_to(['for': 'logout'], '<i class="icon far fa-times-circle"></i> Log out') }}</li>
</ul>
</div>

4
app/views/main/callback/list.volt
View file

@ -2,9 +2,9 @@
<div class="section">
<div class="clearfix">
<h2 class="pull-left">Callbacks</h2>
<h2 class="float-start">Callbacks</h2>
<div class="pull-right">
<div class="float-end">
<a class="button button-large button-primary" href="{{ url('/callback/new') }}">
{{ icon('solid/plus') }} New
</a>

28
app/views/main/callback/new.volt
View file

@ -3,37 +3,17 @@
<h2>Create callback</h2>
<!--
<form class="form-horizontal" method="post">
<div class="form-group">
<label class="col-sm-2 control-label" for="name">Name</label>
<div class="col-sm-10">
<input type="text" class="form-control" name="name" id="name">
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<input type="submit" class="button button-brand" value="Create">
</div>
</div>
</form>
-->
<form class="form-horizontal" method="post">
<div class="form-group">
<label class="col-sm-2 control-label" for="name">Name</label>
<div class="row mb-3">
<label class="col-sm-2 col-form-label text-end" for="name">Name</label>
<div class="col-sm-10">
{{ form.render('Name') }}
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="row mb-3">
<div class="offset-sm-2 col-sm-10">
{{ form.render('Create') }}
</div>
</div>
</form>
</div>

25
app/views/main/callback/show.volt
View file

@ -1,18 +1,18 @@
<div class="section">
<div class="clearfix">
<h3 class="pull-left">{{ item.name|e }}</h3>
<h5 class="pull-right"><strong>Created at:</strong> {{ item.created_at }}</h5>
<h4 class="float-start">{{ item.name|e }}</h4>
<h6 class="float-end"><strong>Created at:</strong> {{ item.created_at }}</h6>
</div>
<div class="panel-group request-list" id="request-list" role="tablist" aria-multiselectable="true">
<div class="panel-group request-list" id="request-list">
{% for index, req in page.items %}
<div class="panel request-list-item">
<a id="request-item-head-{{ index }}" class="request-list-item-header collapsed"
href="#request-item-body-{{ index }}" aria-controls="request-item-body-{{ index }}"
data-parent="#request-list" data-toggle="collapse" aria-expanded="true" >
href="#request-item-body-{{ index }}" role="button" aria-controls="request-item-body-{{ index }}"
data-bs-toggle="collapse" aria-expanded="true" >
<div class="request-list-item-header-row">
@ -46,20 +46,19 @@
</div>
</a>
<div id="request-item-body-{{ index }}" class="collapse"
role="tabpanel" aria-labelledby="request-item-head-{{ index }}">
<div id="request-item-body-{{ index }}" class="collapse" data-bs-parent="#request-list">
<div class="request-list-item-detail">
{% if req.getUriQuery()|length > 0 %}
<button class="request-list-item-detail-button" type="button"
data-toggle="collapse" data-target="#request-list-item-detail-query-{{ index }}"
<button class="request-list-item-detail-button" type="button" role="button"
data-bs-toggle="collapse" data-bs-target="#request-list-item-detail-query-{{ index }}"
aria-expanded="false" aria-controls="request-list-item-detail-query-{{ index }}">
Query
</button>
<div id="request-list-item-detail-query-{{ index }}" class="collapse in">
<div id="request-list-item-detail-query-{{ index }}" class="collapse show">
<table class="request-list-item-detail-headers">
<thead>
<tr>
@ -81,7 +80,7 @@
{% endif %}
<button class="request-list-item-detail-button" type="button"
data-toggle="collapse" data-target="#request-list-item-detail-headers-{{ index }}"
data-bs-toggle="collapse" data-bs-target="#request-list-item-detail-headers-{{ index }}"
aria-expanded="false" aria-controls="request-list-item-detail-headers-{{ index }}">
Headers
</button>
@ -106,7 +105,7 @@
</div>
<button class="request-list-item-detail-button" type="button"
data-toggle="collapse" data-target="#request-list-item-detail-body-{{ index }}"
data-bs-toggle="collapse" data-bs-target="#request-list-item-detail-body-{{ index }}"
aria-expanded="false" aria-controls="request-list-item-detail-body-{{ index }}">
Body
</button>
@ -118,7 +117,7 @@
<h3>Empty body</h3>
</div>
{% else %}
<pre>{{ req.getBody() }}</pre>
<pre class="code"><code>{{ req.getBody() }}</code></pre>
{% endif %}
</div>
</div>

2
app/views/main/index/about.volt
View file

@ -46,7 +46,7 @@
<div class="phalcon">
<a target="_blank" href="http://phalconphp.com">
<img class="img-responsive" src="/img/phalcon-php.png" />
<img class="img-fluid" src="/img/phalcon-php.png" />
</a>
</div>

46
app/views/main/user/settings.volt
View file

@ -11,47 +11,48 @@
<form class="form-horizontal" method="post" action="">
<div class="form-group">
<div class="row mb-3">
{{ form.renderDecorated('username', [ 'length': 7 ]) }}
{{ form.renderDecorated('id', [ 'length': 2, 'label-length' : 1 ]) }}
</div>
<div class="form-group">
<div class="row mb-3">
{{ form.renderDecorated('name') }}
</div>
<div class="form-group">
<div class="row mb-3">
{{ form.renderDecorated('email') }}
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<h4>Password</h4>
<div class="row mb-3">
<div class="col-sm-10 offset-sm-2">
<h5>Password</h5>
</div>
</div>
{% if form.has('passwordCurrent') %}
<div class="form-group">
<div class="row mb-3">
{{ form.renderDecorated('passwordCurrent') }}
</div>
{% endif %}
<div class="form-group">
<div class="row mb-3">
{{ form.renderDecorated('passwordNew') }}
</div>
<div class="form-group">
<div class="row mb-3">
{{ form.renderDecorated('passwordConfirm') }}
</div>
<div class="form-group">
<div class="row mb-3">
<div class="col-sm-offset-2 col-sm-10">
<div class="col-sm-10 offset-sm-2">
<h4>Social sign-in</h4>
<h5>Social sign-in</h5>
<hr />
<div class="row">
{% for name,info in social_links %}
<div class="col-sm-2 text-center">
{% set class = info['class'] | default(false) %}
@ -63,16 +64,17 @@
{% endif %}
</div>
{% endfor %}
</div>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<div class="row mb-3">
<div class="col-sm-10 offset-sm-2">
<hr />
{{ form.render('Save') }}
<button class="button button-danger pull-right" type="button" data-toggle="modal" data-target="#deleteModal">
<button class="button button-danger float-end" type="button" data-bs-toggle="modal" data-bs-target="#deleteModal">
Delete Account
</button>
</div>
@ -81,14 +83,12 @@
</form>
</div>
<div class="modal fade" id="deleteModal" tabindex="-1" role="dialog" aria-labelledby="deleteModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title pull-left" id="deleteModalLabel">Delete account</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title float-start" id="deleteModalLabel">Delete account</h4>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<form method="post" action="/user/delete">
@ -105,12 +105,10 @@
</div>
<div class="modal-footer">
<button type="button" class="button button-default" data-dismiss="modal">Close</button>
<button type="button" class="button button-default" data-bs-dismiss="modal">Close</button>
<input type="submit" name="deleteAcc" class="button button-danger" value="Delete account">
</div>
</form>
</div>
</div>
</div>